Changeset 1d02f01 in bootscripts-standard for clfs/sysconfig/network-devices/services/ipv4-static

Timestamp:

Oct 23, 2007, 1:07:58 AM (17 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

master

Children:

1680407

Parents:

d8a3177

Message:

Merged Updates from BLFS/LFS SVNs

File:

• clfs/sysconfig/network-devices/services/ipv4-static (modified) (1 diff)

clfs/sysconfig/network-devices/services/ipv4-static

@@ -44 +44 @@
 fi
 
-if [ -n "${SOURCE}" ]; then
-        args="${args} src ${SOURCE}"
-fi
-
 case "${2}" in
         up)
                 boot_mesg "Adding IPv4 address ${IP} to the ${1} interface..."
-                if [ "${INTERFACE}" != "" ]; then
-                        ip addr add ${args} dev ${1} label ${1}
-                else
-                        ip addr add ${args} dev ${1}
-                fi
+                ip addr add ${args} dev ${1}
                 evaluate_retval
         
-                if [ "${INTERFACE}" = "" ]; then
-                        if [ -n "${GATEWAY}" ]; then
-                                if ip route | grep -q default; then
-                                        boot_mesg "Gateway already setup; skipping." ${WARNING}
-                                        echo_warning
-                                else
-                                        boot_mesg "Setting up default gateway..."
-                                        ip route add default via ${GATEWAY} dev ${1}
-                                        evaluate_retval
-                                 fi
-                        fi
+                if [ -n "${GATEWAY}" ]; then
+                        if ip route | grep -q default; then
+                                boot_mesg "Gateway already setup; skipping." ${WARNING}
+                                echo_warning
+                        else
+                                boot_mesg "Setting up default gateway..."
+                                ip route add default via ${GATEWAY} dev ${1}
+                                evaluate_retval
+                         fi
                 fi
         ;;
         
         down)
-                if [ "${INTERFACE}" = "" ]; then
-                        boot_mesg "Removing Settings From ${1} interface..."
-                        ip address flush dev ${1}
+                if [ -n "${GATEWAY}" ]; then
+                        boot_mesg "Removing default gateway..."
+                        ip route del default
                         evaluate_retval
                 fi
+        
+                boot_mesg "Removing IPv4 address ${IP} from the ${1} interface..."
+                ip addr del ${args} dev ${1}
+                evaluate_retval
         ;;