mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Put added option in dhcp config instead of dhcpv6 config.

Browse Source 
Use empty function instead of <> "" for null test in dhcp network booting config section.
	modified:   etc/inc/services.inc
This commit is contained in:
Donald A. Cupp Jr 2014-03-03 11:20:44 -08:00
parent c10d55ba64
commit fdb116a97b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
etc/inc/services.inc
View File

@ -419,6 +419,7 @@ function services_dhcpdv4_configure() {
option domain-name "{$syscfg['domain']}";
option ldap-server code 95 = text;
option domain-search-list code 119 = text;
option arch code 93 = unsigned integer 16; # RFC4578
{$custoptions}
default-lease-time 7200;
max-lease-time 86400;
@ -763,18 +764,18 @@ EOD;
if ($dhcpifconf['nextserver'] <> "") {
$dhcpdconf .= " next-server {$dhcpifconf['nextserver']};\n";
}
if (($dhcpifconf['filename'] <> "") && ($dhcpifconf['filename32'] <> "") && ($dhcpifconf['filename64'] <> "")) {
$dhcpdconf .= " if option arch = 00:06 {\n";
$dhcpdconf .= " filename \"{$dhcpifconf['filename32']}\";\n";
$dhcpdconf .= " } else if option arch = 00:07 {\n";
$dhcpdconf .= " filename \"{$dhcpifconf['filename64']}\";\n";
$dhcpdconf .= " } else {\n";
$dhcpdconf .= " filename \"{$dhcpifconf['filename']}\";\n";
$dhcpdconf .= " }\n\n";
} elseif ($dhcpifconf['filename'] <> "") {
if (!empty($dhcpifconf['filename']) && !empty($dhcpifconf['filename32']) && !empty($dhcpifconf['filename64'])) {
$dhcpdconf .= " if option arch = 00:06 {\n";
$dhcpdconf .= " filename \"{$dhcpifconf['filename32']}\";\n";
$dhcpdconf .= " } else if option arch = 00:07 {\n";
$dhcpdconf .= " filename \"{$dhcpifconf['filename64']}\";\n";
$dhcpdconf .= " } else {\n";
$dhcpdconf .= " filename \"{$dhcpifconf['filename']}\";\n";
$dhcpdconf .= " }\n\n";
} elseif (!empty($dhcpifconf['filename'])) {
$dhcpdconf .= " filename \"{$dhcpifconf['filename']}\";\n";
}
if ($dhcpifconf['rootpath'] <> "") {
if (!empty($dhcpifconf['rootpath'])) {
$dhcpdconf .= " option root-path \"{$dhcpifconf['rootpath']}\";\n";
}
}
@ -1080,7 +1081,6 @@ function services_dhcpdv6_configure($blacklist = array()) {
option domain-name "{$syscfg['domain']}";
option ldap-server code 95 = text;
option domain-search-list code 119 = text;
option arch code 93 = unsigned integer 16; RFC4578
{$custoptionsv6}
default-lease-time 7200;
max-lease-time 86400;