- fixed DEVICETYPE determination for aliased devices

svn-id: @800

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 85403b3286091efe41787154506b20565bea025d..45c2fca145bff4fa89c7712f05b03a4075eb404d 100755 (executable)
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifdown,v 1.24 2000/05/31 17:55:05 zagrodzki Exp $
+#      $Id: ifdown,v 1.25 2000/09/23 20:43:05 saq Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
@@ -52,8 +52,8 @@ if [ -z "$NETMASK" -a -n "$PREFIX" ]; then
 fi
 
 FULLDEVNAME="$DEVICE"
-DEVICETYPE=`echo $FULLDEVNAME | sed "s/[0-9]*$//"`
 DEVICE=`echo $FULLDEVNAME | sed 's/:.*//g'`
+DEVICETYPE=`echo $DEVICE | sed "s/[0-9]*$//"`
 OTHERSCRIPT="/etc/sysconfig/network-scripts/ifdown-${DEVICETYPE}"
 
 if [ -x $OTHERSCRIPT ]; then

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index f3668d2eb36c1e57e2a0ebae73d3732ce32c5bfe..002baa590b483c1069a4169be5d4f09af08a36df 100755 (executable)
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifup,v 1.47 2000/09/19 12:46:45 saq Exp $
+#      $Id: ifup,v 1.48 2000/09/23 20:43:05 saq Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
@@ -41,10 +41,10 @@ IPSETUP=no
 
 # full network device name
 FULLDEVNAME="$DEVICE"
-# detect network device type (dummy, eth ..)
-DEVICETYPE=`echo $FULLDEVNAME | sed "s/[0-9]*$//"`
 # real name of device (is eth0 for eth0,eth0:1,eth0:alias)
 DEVICE=`echo $FULLDEVNAME | sed 's/:.*//g'`
+# detect network device type (dummy, eth ..)
+DEVICETYPE=`echo $DEVICE | sed "s/[0-9]*$//"`
 
 if echo "$FULLDEVNAME" | grep -q ':' ; then
     ISALIAS=yes