Changeset efc99f2 for bootscripts/clfs/sysconfig/network-devices/ifdown

Timestamp:

Oct 31, 2006, 9:38:50 PM (17 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

728f219

Parents:

0928ac4

Message:

Added the ability to have network subinterfaces

File:

• bootscripts/clfs/sysconfig/network-devices/ifdown (modified) (1 diff)

bootscripts/clfs/sysconfig/network-devices/ifdown

@@ -62 +62 @@
                         continue
                 fi
-        
+                
+                # This will allow us to assign subinterfaces to our primary
+                if [ "${INTERFACE}" != "" ]; then
+                        NET_IF=${INTERFACE}
+                else
+                        NET_IF=${1}
+                fi
+
                 # This will run the service script, if SERVICE is set
-                if [ -n "${SERVICE}" -a -x "${network_devices}/services/${SERVICE}" ]; then
-                        TEST="`ip addr show ${1} | grep inet | cut -f1 -d'/' | cut -f2 -d't' | cut -f2 -d' '`"
-                        if [ -z "$TEST" ]; then
-                                boot_mesg "Interface ${1} already disabled." ${WARNING}
-                                echo_warning
+                if [ "${INTERFACE}" = "" ]; then
+                        if [ -n "${SERVICE}" -a -x "${network_devices}/services/${SERVICE}" ]; then
+                                TEST="`ip addr show ${NET_IF} | grep inet | grep ${NET_IF} | cut -f1 -d'/' | cut -f2 -d't' | cut -f2 -d' '`"
+                                if [ -z "$TEST" ]; then
+                                        boot_mesg "Interface ${NET_IF} already disabled." ${WARNING}
+                                        echo_warning
+                                        continue
+                                else
+                                        if ip link show ${NET_IF} > /dev/null 2>&1; then
+                                                IFCONFIG=${file} ${network_devices}/services/${SERVICE} ${NET_IF} down
+                                        else
+                                                boot_mesg "Interface ${NET_IF} doesn't exist." ${WARNING}
+                                                echo_warning
+                                        fi
+                                fi
+                        else
+                                boot_mesg -n "Unable to process ${file}.  Either" ${FAILURE}
+                                boot_mesg -n " the SERVICE variable was not set,"
+                                boot_mesg " or the specified service cannot be executed."
+                                echo_failure
                                 continue
-                        else
-                                if ip link show ${1} > /dev/null 2>&1; then
-                                        IFCONFIG=${file} ${network_devices}/services/${SERVICE} ${1} down
-                                else
-                                        boot_mesg "Interface ${1} doesn't exist." ${WARNING}
-                                        echo_warning
-                                fi
                         fi
-                else
-                        boot_mesg -n "Unable to process ${file}.  Either" ${FAILURE}
-                        boot_mesg -n " the SERVICE variable was not set,"
-                        boot_mesg " or the specified service cannot be executed."
-                        echo_failure
-                        continue
                 fi
         )
 done
 
-if [ -z "${2}" ]; then
-        link_status=`ip link show ${1} 2> /dev/null | grep ${1}`
-        if [ -n "${link_status}" ]; then
-                if echo "${link_status}" | grep -q UP; then
-                        boot_mesg "Bringing down the ${1} interface..."
-                        ip link set ${1} down
-                        evaluate_retval
-                fi
+if [ "${INTERFACE}" = "" ]; then
+        if [ -z "${2}" ]; then
+                boot_mesg "Bringing down the ${1} interface..."
+                ip link set ${1} down
+                evaluate_retval
         fi
 fi