From 5d2866f12529550c960cda188799bc5cca069dfc Mon Sep 17 00:00:00 2001 From: mtm Date: Thu, 20 May 2004 14:16:05 +0000 Subject: The err routine requires two arguments: an exit value and a string. Additionaly, it will exit the script so an return statements after calling it are superflous. --- etc/rc.d/dhclient | 3 +-- etc/rc.d/netif | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'etc') diff --git a/etc/rc.d/dhclient b/etc/rc.d/dhclient index 2a6e13d..dce8717 100755 --- a/etc/rc.d/dhclient +++ b/etc/rc.d/dhclient @@ -37,8 +37,7 @@ dhclient_common() if [ -n "$_cmdifn" ]; then eval _cooked_list=\"`expr "$dhcp_list" : ".*\($_cmdifn\).*"`\" if [ -z "$_cooked_list" ]; then - err "No such network interface: $_cmdifn" - return 1 + err 1 "No such network interface: $_cmdifn" fi fi } diff --git a/etc/rc.d/netif b/etc/rc.d/netif index 42a35b0..38e4478 100644 --- a/etc/rc.d/netif +++ b/etc/rc.d/netif @@ -85,7 +85,7 @@ network_common() _verbose= if [ -z "$1" ]; then - err "network_common(): No function name specified." + err 1 "network_common(): No function name specified." else _func="$1" fi @@ -100,7 +100,7 @@ network_common() if [ -n "$_cmdifn" ]; then eval _cooked_list=\"`expr "$_ifn_list" : ".*\($_cmdifn\).*"`\" if [ -z "$_cooked_list" ]; then - err "No such network interface: $_cmdifn" + err 1 "No such network interface: $_cmdifn" return 1 fi fi -- cgit v1.1