Date: Thu, 2 Jun 2011 14:08:51 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r222611 - head/usr.sbin/bsdinstall/scripts Message-ID: <201106021408.p52E8pIH020590@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Thu Jun 2 14:08:50 2011 New Revision: 222611 URL: http://svn.freebsd.org/changeset/base/222611 Log: 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 Modified: head/usr.sbin/bsdinstall/scripts/netconfig Modified: head/usr.sbin/bsdinstall/scripts/netconfig ============================================================================== --- head/usr.sbin/bsdinstall/scripts/netconfig Thu Jun 2 14:04:07 2011 (r222610) +++ head/usr.sbin/bsdinstall/scripts/netconfig Thu Jun 2 14:08:50 2011 (r222611) @@ -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 dia 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=""
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106021408.p52E8pIH020590>