diff options
| author | avos <avos@FreeBSD.org> | 2016-05-26 11:58:36 +0000 |
|---|---|---|
| committer | avos <avos@FreeBSD.org> | 2016-05-26 11:58:36 +0000 |
| commit | bc1b30bf9fbf3d9520abb2fb902d0911c46457b1 (patch) | |
| tree | 6c0e00bec9cec0e4a70476386a7a03c256096ebf /usr.sbin/bsdinstall | |
| parent | e46113c35578de1bcd939c8d96610c6ddeded3b8 (diff) | |
| download | FreeBSD-src-bc1b30bf9fbf3d9520abb2fb902d0911c46457b1.zip FreeBSD-src-bc1b30bf9fbf3d9520abb2fb902d0911c46457b1.tar.gz | |
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
Diffstat (limited to 'usr.sbin/bsdinstall')
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/netconfig_ipv4 | 6 |
1 files changed, 5 insertions, 1 deletions
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 |
