diff options
| author | gnhb <gnoahb@gmail.com> | 2010-08-24 15:38:45 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2010-08-24 15:38:45 +0700 |
| commit | 15d456b9ea73270bebecda69be9e41443c95c533 (patch) | |
| tree | 1a296b0330fadea35bdec70fc162b4d2f8814c8c | |
| parent | d6d50244df14c43832cca5199b04e659557c20dd (diff) | |
| download | pfsense-15d456b9ea73270bebecda69be9e41443c95c533.zip pfsense-15d456b9ea73270bebecda69be9e41443c95c533.tar.gz | |
Fix declaration. Change 'global $configure' to 'global $config' to
make function work.
Also, remove reference to $syscfg variable not declared in new
system_dhcpleases_configure.
| -rw-r--r-- | etc/inc/system.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 3578ee7..2f9e874 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -233,20 +233,20 @@ function system_hosts_generate() { } function system_dhcpleases_configure() { - global $configure, $g; - + global $config, $g; + /* Start the monitoring process for dynamic dhcpclients. */ if (isset($config['dnsmasq']['regdhcp'])) { /* Make sure we do not error out */ @touch("{$g['dhcpd_chroot_path']}/var/db/dhcpd.leases"); - if (file_exists("{$g['varrun_path']}/dhcpleases.pid")) - sigkillbypid("{$g['varrun_path']}/dhcpleases.pid", "HUP"); - else - mwexec("/usr/local/sbin/dhcpleases -l {$g['dhcpd_chroot_path']}/var/db/dhcpd.leases -d {$syscfg['domain']} -p {$g['varrun_path']}/dnsmasq.pid -h {$g['varetc_path']}/hosts"); - } else { - sigkillbypid("{$g['varrun_path']}/dhcpleases.pid", "TERM"); - @unlink("{$g['varrun_path']}/dhcpleases.pid"); - } + if (file_exists("{$g['varrun_path']}/dhcpleases.pid")) + sigkillbypid("{$g['varrun_path']}/dhcpleases.pid", "HUP"); + else + mwexec("/usr/local/sbin/dhcpleases -l {$g['dhcpd_chroot_path']}/var/db/dhcpd.leases -d {$config['system']['domain']} -p {$g['varrun_path']}/dnsmasq.pid -h {$g['varetc_path']}/hosts"); + } else { + sigkillbypid("{$g['varrun_path']}/dhcpleases.pid", "TERM"); + @unlink("{$g['varrun_path']}/dhcpleases.pid"); + } } function system_hostname_configure() { |
