mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00
Code Issues Releases Activity

Produce meaningful exit code

Browse Source 
MFC after:	3 days
X-MFC-to:	stable/10
This commit is contained in:
Devin Teske 2015-09-11 21:08:46 +00:00
parent 1a8cf17d01
commit 5e1ed71e4f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=287690
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/bsdinstall/scripts/netconfig_ipv4
View File

@ -1,7 +1,7 @@
#!/bin/sh
#-
# Copyright (c) 2011 Nathan Whitehorn
# Copyright (c) 2013 Devin Teske
# Copyright (c) 2013-2015 Devin Teske
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@ -80,16 +80,20 @@ echo $INTERFACE $IF_CONFIG |
printf("ifconfig_%s=\"%s\inet %s netmask %s\"\n", $1, prefix, $2, $3);
printf("defaultrouter=\"%s\"\n", $4);
}' >> $BSDINSTALL_TMPETC/._rc.conf.net
retval=$?
if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
if [ "$BSDINSTALL_CONFIGCURRENT" ]; then
. $BSDINSTALL_TMPETC/._rc.conf.net
ifconfig $INTERFACE `eval echo \\\$ifconfig_$INTERFACE`
if [ -n "${defaultrouter}" ]; then
if [ "$defaultrouter" ]; then
route delete -inet default
route add -inet default $defaultrouter
retval=$?
fi
fi
exit $retval
################################################################################
# END
################################################################################

10
usr.sbin/bsdinstall/scripts/netconfig_ipv6
View File

@ -2,7 +2,7 @@
#-
# Copyright (c) 2011 Nathan Whitehorn
# Copyright (c) 2011 The FreeBSD Foundation
# Copyright (c) 2013 Devin Teske
# Copyright (c) 2013-2015 Devin Teske
# All rights reserved.
#
# Portions of this software were developed by Bjoern Zeeb
@ -141,16 +141,20 @@ BEGIN {
}
printf("ifconfig_%s_ipv6=\"inet6 %s\"\n", iface, $1);
}' >> $BSDINSTALL_TMPETC/._rc.conf.net
retval=$?
if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
if [ "$BSDINSTALL_CONFIGCURRENT" ]; then
. $BSDINSTALL_TMPETC/._rc.conf.net
ifconfig ${INTERFACE} `eval echo \\\$ifconfig_${INTERFACE}_ipv6`
if [ -n "${ipv6_defaultrouter}" ]; then
if [ "$ipv6_defaultrouter" ]; then
route delete -inet6 default
route add -inet6 default ${ipv6_defaultrouter}
retval=$?
fi
fi
exit $retval
################################################################################
# END
################################################################################