diff options
| -rw-r--r-- | usr/src/lib/brand/joyent/zone/statechange.ksh | 5 | ||||
| -rwxr-xr-x | usr/src/lib/brand/kvm/zone/statechange.ksh | 6 |
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 |