diff options
| author | Rob Gulewich <robert.gulewich@joyent.com> | 2011-09-30 17:51:05 -0700 |
|---|---|---|
| committer | Rob Gulewich <robert.gulewich@joyent.com> | 2011-09-30 17:51:05 -0700 |
| commit | cb866ae1d95a57b3ac6bf38040e40ed0cd4fe835 (patch) | |
| tree | 76d46d34ba67f62f3feff1d23e2746c5a3def2c2 /usr/src | |
| parent | b2887263c9a582abbb2f5398460202495310a691 (diff) | |
| download | illumos-joyent-cb866ae1d95a57b3ac6bf38040e40ed0cd4fe835.tar.gz | |
[NET-139] create-machine should support dhcp nics
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/brand/joyent/zone/statechange.ksh | 3 | ||||
| -rwxr-xr-x | usr/src/lib/brand/kvm/zone/statechange.ksh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/lib/brand/joyent/zone/statechange.ksh b/usr/src/lib/brand/joyent/zone/statechange.ksh index 9a1059ac8b..30e3e4be13 100644 --- a/usr/src/lib/brand/joyent/zone/statechange.ksh +++ b/usr/src/lib/brand/joyent/zone/statechange.ksh @@ -254,7 +254,8 @@ setup_net() fi fi - if [[ -n "${zone_ip}" ]] && [[ -n "${ip_spoof_enabled}" ]]; then + if [[ -n "${zone_ip}" ]] && [[ -n "${ip_spoof_enabled}" ]] && \ + [[ "${zone_ip}" != "dhcp" ]]; then dladm set-linkprop -t -z $ZONENAME \ -p "allowed-ips=${zone_ip}" ${nic} if (( $? != 0 )); then diff --git a/usr/src/lib/brand/kvm/zone/statechange.ksh b/usr/src/lib/brand/kvm/zone/statechange.ksh index 767192ffa6..d34177da62 100755 --- a/usr/src/lib/brand/kvm/zone/statechange.ksh +++ b/usr/src/lib/brand/kvm/zone/statechange.ksh @@ -238,7 +238,8 @@ setup_net() fi fi - if [[ -n "${zone_ip}" ]] && [[ -n "${ip_spoof_enabled}" ]]; then + if [[ -n "${zone_ip}" ]] && [[ -n "${ip_spoof_enabled}" ]] && \ + [[ "${zone_ip}" != "dhcp" ]]; then dladm set-linkprop -t -z $ZONENAME \ -p "allowed-ips=${zone_ip}" ${nic} if (( $? != 0 )); then |