summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorJosh Wilsdon <jwilsdon@joyent.com>2011-12-03 05:48:53 +0000
committerJosh Wilsdon <jwilsdon@joyent.com>2011-12-03 05:49:37 +0000
commitb41a459e4355329324bb7c2dff806d24aa8aa1ea (patch)
tree9fbdba8122bb2f8c26bba53fad248b59a282e36e /usr/src
parente69e89cb1cdc808c06f0a8d074ec6cd5fd0300d1 (diff)
downloadillumos-joyent-b41a459e4355329324bb7c2dff806d24aa8aa1ea.tar.gz
OS-789 fix dhcp_server parameter to be boolean property.
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/lib/brand/joyent/zone/statechange.ksh5
-rwxr-xr-xusr/src/lib/brand/kvm/zone/statechange.ksh6
2 files changed, 3 insertions, 8 deletions
diff --git a/usr/src/lib/brand/joyent/zone/statechange.ksh b/usr/src/lib/brand/joyent/zone/statechange.ksh
index 6d5749fd1e..7d7d0213a4 100644
--- a/usr/src/lib/brand/joyent/zone/statechange.ksh
+++ b/usr/src/lib/brand/joyent/zone/statechange.ksh
@@ -226,10 +226,7 @@ setup_net()
# Set up antispoof options
- # XXX For backwards compatibility, special handling for
- # zone named "dhcpd". Remove this check once property
- # is added to zone.
- if [[ $ZONENAME == "dhcpd" ]] || [[ $dhcp_server == "1" ]]; then
+ if [[ $dhcp_server == "1" ]] || [[ $dhcp_server == "true" ]]; then
enable_dhcp="true"
# This needs to be off for dhcp server zones
allow_ip_spoof=1
diff --git a/usr/src/lib/brand/kvm/zone/statechange.ksh b/usr/src/lib/brand/kvm/zone/statechange.ksh
index d34177da62..6efe6f3cb5 100755
--- a/usr/src/lib/brand/kvm/zone/statechange.ksh
+++ b/usr/src/lib/brand/kvm/zone/statechange.ksh
@@ -91,6 +91,7 @@ setup_net()
do
# Get simplified versions of the network config. variables.
address=$(eval echo \$_ZONECFG_net_${nic}_address)
+ dhcp_server=$(eval echo \$_ZONECFG_net_${nic}_dhcp_server)
global_nic=$(eval echo \$_ZONECFG_net_${nic}_global_nic)
mac_addr=$(eval echo \$_ZONECFG_net_${nic}_mac_addr)
vlan_id=$(eval echo \$_ZONECFG_net_${nic}_vlan_id)
@@ -198,10 +199,7 @@ setup_net()
# Set up antispoof options
- # XXX For backwards compatibility, special handling for
- # zone named "dhcpd". Remove this check once property
- # is added to zone.
- if [[ $ZONENAME == "dhcpd" ]] || [[ $dhcp_server == "1" ]]; then
+ if [[ $dhcp_server == "1" ]] || [[ $dhcp_server == "true" ]]; then
enable_dhcp="true"
# This needs to be off for dhcp server zones
allow_ip_spoof=1