Changeset dc55fb5e for bootscripts/contrib/lsb-v3/sbin/ifdown

Timestamp:

05/14/2011 09:00:31 PM (13 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

9f55ea0

Parents:

b4a6782

Message:

Changes per thread starting at ​http://archive.linuxfromscratch.org/mail-archives/lfs-dev/2011-May/064677.html

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9532 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• bootscripts/contrib/lsb-v3/sbin/ifdown (modified) (3 diffs)

bootscripts/contrib/lsb-v3/sbin/ifdown

@@ -21 +21 @@
 if [ -n "${2}" ]; then
     for file in ${@#$1}; do # All parameters except $1
-        FILES="${FILES} ${NETWORK_DEVICES}/ifconfig.${1}/${file}"
+        FILES="${FILES} /run/network/ifconfig.${1}/${file}"
     done
-elif [ -d "${NETWORK_DEVICES}/ifconfig.${1}" ]; then
-    FILES=`echo ${NETWORK_DEVICES}/ifconfig.${1}/*`
+elif [ -d "/run/network/ifconfig.${1}" ]; then
+    FILES=`echo /run/network/ifconfig.${1}/*`
 else
-    FILES="${NETWORK_DEVICES}/ifconfig.${1}"
+    FILES="/run/network/ifconfig.${1}"
 fi
 
@@ -47 +47 @@
     fi
     (
-        . ${file}
+        if [ ! -d "${file}" ]; then
+            . ${file}
+        fi
 
         # Will not process this service if started by boot, and ONBOOT
@@ -62 +64 @@
     
         # This will run the service script, if SERVICE is set
-        if [ -n "${SERVICE}" -a -x "${NETWORK_DEVICES}/services/${SERVICE}" ]; then
+        if [ -n "${SERVICE}" -a -x "/lib/network-services/${SERVICE}" ]; then
             if ip link show ${1} > /dev/null 2>&1
             then
-                IFCONFIG=${file} ${NETWORK_DEVICES}/services/${SERVICE} ${1} down
+                IFCONFIG=${file} /lib/network-services/${SERVICE} ${1} down &&
+                if [ -f "${file}" ]; then
+                    rm ${file}
+                fi
             else
                 message="Interface ${1} doesn't exist."