Changeset 15962fe

Timestamp:

Sep 2, 2006, 11:02:35 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:

c4fcf54

Parents:

3a86839

Message:

r5521@server: jim | 2006-09-02 23:02:09 -0700
Added check to make sure interface is not configured

Location:

bootscripts

Files:

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

bootscripts/Changelog

@@ +1 @@
+n/a - September 2, 2006
+        * Add a check to see if the interface is already setup
+
 jim - August 27, 2006
         * Added the same change to ifdown script. 

bootscripts/lfs/sysconfig/network-devices/ifup

@@ -63 +63 @@
                 if [ -n "${SERVICE}" -a -x "${network_devices}/services/${SERVICE}" ]; then
                         if [ -z "${CHECK_LINK}" -o "${CHECK_LINK}" = "y" -o "${CHECK_LINK}" = "yes" -o "${CHECK_LINK}" = "1" ]; then
-                                if ip link show ${1} > /dev/null 2>&1; 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
-                                                        ip link set ${1} up
+                                TEST="`ip addr show ${1} | grep inet | cut -f1 -d'/' | cut -f2 -d't' | cut -f2 -d' '`"
+                                if [ "$TEST" != "" ]; then
+                                                boot_mesg "Interface ${1} already configured." ${WARNING}
+                                                echo_warning
+                                                continue
+                                else
+                                        if ip link show ${1} > /dev/null 2>&1; 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
+                                                                ip link set ${1} up
+                                                        fi
                                                 fi
+                                        else
+                                                boot_mesg "Interface ${1} doesn't exist." ${WARNING}
+                                                echo_warning
+                                                continue
                                         fi
-                                else
-                                        boot_mesg "Interface ${1} doesn't exist." ${WARNING}
-                                        echo_warning
-                                        continue
                                 fi
                         fi