From ee1b024ea938c0df466d48136958a7f3aee3ed84 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Thu, 2 Aug 2007 11:43:04 +0000 Subject: - correct behaviour of dhcpd.conf creation - enable root-path --- etc/inc/services.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'etc/inc') diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 321e13f..a065167 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -276,10 +276,10 @@ EOD; if (is_array($dhcpifconf['ntpserver']) && $dhcpifconf['ntpserver'][0]) $dhcpdconf .= " option ntp-servers " . join(",", $dhcpifconf['ntpserver']) . ";\n"; - if (isset($dhcpifconf['tftp'])) + if ($dhcpifconf['tftp'] <> "") $dhcpdconf .= " option tftp-server-name \"{$dhcpifconf['tftp']}\";\n"; - if (isset($dhcpifconf['ldap'])) + if ($dhcpifconf['ldap'] <> "") $dhcpdconf .= " option ldap-server \"{$dhcpifconf['ldap']}\";\n"; if(isset($dhcpifconf['netboot'])) { @@ -287,7 +287,11 @@ EOD; $dhcpdconf .= " next-server {$dhcpifconf['next-server']};\n"; $dhcpdconf .= " filename \"{$dhcpifconf['filename']}\";\n"; } + if (($dhcpifconf['rootpathip'] <> "") && ($dhcpifconf['rootpath'] <> "")) { + $dhcpdconf .= " option root-path \"{$dhcpifconf['rootpathip']}:{$dhcpifconf['rootpath']}\";\n"; + } } + $dhcpdconf .= <<