svn commit: r300735 - head/usr.sbin/bsdinstall/scripts

[Andriy Voskoboinyk]

Author: avos
Date: Thu May 26 11:58:36 2016
New Revision: 300735
URL: https://svnweb.freebsd.org/changeset/base/300735

Log:
  bsdinstall: unbreak static address assignment for wired networks.
  
  This fixes regression introduced in r298946 (fixes static address
  assignment for wireless networks).
  
  Reported & submitted by:	allanjude

Modified:
  head/usr.sbin/bsdinstall/scripts/netconfig_ipv4

Modified: head/usr.sbin/bsdinstall/scripts/netconfig_ipv4
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/netconfig_ipv4	Thu May 26 11:40:07 2016	(r300734)
+++ head/usr.sbin/bsdinstall/scripts/netconfig_ipv4	Thu May 26 11:58:36 2016	(r300735)
@@ -84,7 +84,11 @@ retval=$?
 
 if [ "$BSDINSTALL_CONFIGCURRENT" ]; then
 	. $BSDINSTALL_TMPETC/._rc.conf.net
-	ifconfig $INTERFACE `eval echo \\\$ifconfig_$INTERFACE | sed "s|$2||"`
+	if [ -n "$2" ]; then
+		ifconfig $INTERFACE `eval echo \\\$ifconfig_$INTERFACE | sed "s|$2||"`
+	else
+		ifconfig $INTERFACE `eval echo \\\$ifconfig_$INTERFACE`
+	fi
 	if [ "$defaultrouter" ]; then
 		route delete -inet default
 		route add -inet default $defaultrouter