Projet

Général

Profil

« Précédent | Suivant » 

Révision 86ce2df7

Ajouté par Renato Botelho il y a plus de 9 ans

Be more strict when checking if olsrd is enabled, otherwise when package is deinstalled and configuration is kept dhcpd will consider it's always as enabled

Voir les différences:

etc/inc/services.inc
358 358
		return 0;
359 359

  
360 360
	/* if OLSRD is enabled, allow WAN to house DHCP. */
361
	if($config['installedpackages']['olsrd'])
361
	if (!function_exists('is_package_installed'))
362
		require_once('pkg-utils.inc');
363
	if (is_package_installed('olsrd') && isset($config['installedpackages']['olsrd']))
362 364
		foreach($config['installedpackages']['olsrd']['config'] as $olsrd)
363
				if($olsrd['enable'])
364
					$is_olsr_enabled = true;
365
			if (isset($olsrd['enable']) && $olsrd['enable'] == "on") {
366
				$is_olsr_enabled = true;
367
				break;
368
			}
365 369

  
366 370
	if ($g['booting']) {
367 371
		/* restore the leases, if we have them */

Formats disponibles : Unified diff