diff options
| author | jpaetzel <jpaetzel@FreeBSD.org> | 2011-11-05 19:25:21 +0000 |
|---|---|---|
| committer | jpaetzel <jpaetzel@FreeBSD.org> | 2011-11-05 19:25:21 +0000 |
| commit | 2e79cf338b15afc6e2daa659795d26dbcf78b422 (patch) | |
| tree | 37fa3690027dda1e75ea7b51dbe4f01eac87e76b /usr.sbin/pc-sysinstall/backend/functions-networking.sh | |
| parent | 4f4798012733e29338d9fc54ff938ec51e669a2e (diff) | |
| download | FreeBSD-src-2e79cf338b15afc6e2daa659795d26dbcf78b422.zip FreeBSD-src-2e79cf338b15afc6e2daa659795d26dbcf78b422.tar.gz | |
Roll up several patches used by PC-BSD.
- Fix an issue with gmirror.
- Allow IPv4 DHCP and IPv6 SLAAC concurrently.
- Fix zpool options using the wrong device name.
Approved by: kib (mentor)
Obtained from: kris@pcbsd.org
MFC after: 3 days
Diffstat (limited to 'usr.sbin/pc-sysinstall/backend/functions-networking.sh')
| -rwxr-xr-x | usr.sbin/pc-sysinstall/backend/functions-networking.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/usr.sbin/pc-sysinstall/backend/functions-networking.sh b/usr.sbin/pc-sysinstall/backend/functions-networking.sh index bdd5a1a..6b8cb1e 100755 --- a/usr.sbin/pc-sysinstall/backend/functions-networking.sh +++ b/usr.sbin/pc-sysinstall/backend/functions-networking.sh @@ -431,6 +431,10 @@ start_networking() elif [ "$NETDEV" = "IPv6-SLAAC" ] then enable_auto_slaac + elif [ "$NETDEV" = "AUTO-DHCP-SLAAC" ] + then + enable_auto_dhcp + enable_auto_slaac else enable_manual_nic ${NETDEV} fi @@ -457,6 +461,10 @@ save_networking_install() elif [ "$NETDEV" = "IPv6-SLAAC" ] then save_auto_slaac + elif [ "$NETDEV" = "AUTO-DHCP-SLAAC" ] + then + save_auto_dhcp + save_auto_slaac else save_manual_nic ${NETDEV} fi |
