ifup and ifdown complain if $1 not specified.

The "ifcfg-" part of the device name is now optional for ifup and ifdown.
ifdown-ppp kills a pppd's chat session if it is active.
Generic part of ifup uses MACADDR variable if present.
ifup-ppp honors DEBUG variable, both for pppd (debug) and chat (-v).

1 files changed, 17 insertions, 4 deletions

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 079d1ff5..ef8fe1cf 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -3,21 +3,34 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 cd /etc/sysconfig/network-scripts
 
+CONFIG=$1
+
+[ -z "$CONFIG" ] && {
+    echo "usage: ifdown <device name>" >&2
+    exit 1
+}
+
+[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
+[ -f "$CONFIG" ] || {
+    echo "usage: ifdown <device name>" >&2
+    exit 1
+}
+
 if [ $UID != 0 ]; then
     if [ -x /usr/sbin/usernetctl ]; then
-        exec /usr/sbin/usernetctl $1 down
+        exec /usr/sbin/usernetctl $CONFIG down
     fi
     echo "Users cannot control this device." >&2
     exit 1
 fi
 
-. $1
+. $CONFIG
 
 DEVICETYPE=`echo $DEVICE | sed "s/[0-9]*$//"`
 OTHERSCRIPT="/etc/sysconfig/network-scripts/ifdown-${DEVICETYPE}"
 
 if [ -x $OTHERSCRIPT ]; then
-	$OTHERSCRIPT $1 $2
+	$OTHERSCRIPT $CONFIG $2
 	exit $?
 fi
 
@@ -38,5 +51,5 @@ fi
 
 ifconfig ${DEVICE} down
 
-exec /etc/sysconfig/network-scripts/ifdown-post $1
+exec /etc/sysconfig/network-scripts/ifdown-post $CONFIG