Project

General

Profile

« Previous | Next » 

Revision 86ce2df7

Added by Renato Botelho over 10 years ago

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

View differences:

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 */

Also available in: Unified diff