diff options
| author | bz <bz@FreeBSD.org> | 2011-06-02 14:08:50 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2011-06-02 14:08:50 +0000 |
| commit | c51270cda9202701419eec54ff0cf10e70c30263 (patch) | |
| tree | bd4d1372009822f6fc0f2f4a360e9688bffbe469 | |
| parent | 575b3fb0289ea04f267b20db4d8960b2888bc4ff (diff) | |
| download | FreeBSD-src-c51270cda9202701419eec54ff0cf10e70c30263.zip FreeBSD-src-c51270cda9202701419eec54ff0cf10e70c30263.tar.gz | |
Empty the network configuration only after the user decided to pick an
interface. Otherwise an accidental start of the netowrk configuration
and immediate cancel after the install has finished removes the previously
configured settings.
Discussed with: nwhitehorn
Sponsored by: The FreeBSD Foundation
Sponsored by: iXsystems
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/netconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/bsdinstall/scripts/netconfig b/usr.sbin/bsdinstall/scripts/netconfig index bef5759..d8984e2 100755 --- a/usr.sbin/bsdinstall/scripts/netconfig +++ b/usr.sbin/bsdinstall/scripts/netconfig @@ -41,8 +41,6 @@ DIALOG_TAGS="" : ${DIALOG_ITEM_HELP=4} : ${DIALOG_ESC=255} -echo -n > $BSDINSTALL_TMPETC/rc.conf.net - for IF in `ifconfig -l`; do test "$IF" = "lo0" && continue (ifconfig -g wlan | egrep -wq $IF) && continue @@ -56,6 +54,8 @@ INTERFACE=`echo $DIALOG_TAGS | xargs dialog --backtitle 'FreeBSD Installer' --ti if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi exec 3>&- +: > $BSDINSTALL_TMPETC/rc.conf.net + # Do a dirty check to see if this a wireless interface -- there should be a # better way IFCONFIG_PREFIX="" |
