From bc1b30bf9fbf3d9520abb2fb902d0911c46457b1 Mon Sep 17 00:00:00 2001
From: avos <avos@FreeBSD.org>
Date: Thu, 26 May 2016 11:58:36 +0000
Subject: 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
---
 usr.sbin/bsdinstall/scripts/netconfig_ipv4 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'usr.sbin/bsdinstall')

diff --git a/usr.sbin/bsdinstall/scripts/netconfig_ipv4 b/usr.sbin/bsdinstall/scripts/netconfig_ipv4
index ffa9846..b7954ef 100755
--- a/usr.sbin/bsdinstall/scripts/netconfig_ipv4
+++ b/usr.sbin/bsdinstall/scripts/netconfig_ipv4
@@ -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
-- 
cgit v1.1