Changeset 8250871 for bootscripts

Timestamp:

Sep 3, 2006, 11:06:10 PM (18 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:

2c088b4

Parents:

18d0acd

Message:

r5529@server: jim | 2006-09-03 23:05:37 -0700
Add a check to see if the interface is already disabled

Location:

bootscripts

Files:

• Changelog (modified) (1 diff)
• lfs/sysconfig/network-devices/ifdown (modified) (1 diff)

bootscripts/Changelog

@@ -1 @@
-n/a - September 2, 2006
+jim - September 2, 2006
+        * Add a check to see if the interface is already disabled
+
+jim - September 2, 2006
         * Add a check to see if the interface is already setup
 

bootscripts/lfs/sysconfig/network-devices/ifdown

@@ -65 +65 @@
                 # This will run the service script, if SERVICE is set
                 if [ -n "${SERVICE}" -a -x "${network_devices}/services/${SERVICE}" ]; then
-                        if ip link show ${1} > /dev/null 2>&1
-                        then
-                                IFCONFIG=${file} ${network_devices}/services/${SERVICE} ${1} down
+                        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
+                                continue
                         else
-                                boot_mesg "Interface ${1} doesn't exist." ${WARNING}
-                                echo_warning
+                                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