Changeset 530d929 for bootscripts/lfs/sbin/ifup

Timestamp:

06/02/2019 11:21:32 AM (5 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib-10.1

Children:

d8a8713

Parents:

4a8482f

Message:

Merge changes from trunk

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11611 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• bootscripts/lfs/sbin/ifup (modified) (7 diffs)

bootscripts/lfs/sbin/ifup

@@ -8 +8 @@
 #               Kevin P. Fleming - kpfleming@linuxfromscratch.org
 # Update      : Bruce Dubbs - bdubbs@linuxfromscratch.org
+#               DJ Lucas - dj@linuxfromscratch.org
 #
 # Version     : LFS 7.7
@@ -19 +20 @@
 up()
 {
+  log_info_msg "Bringing up the ${1} interface..."
+
   if ip link show $1 > /dev/null 2>&1; then
      link_status=`ip link show $1`
@@ -29 +32 @@
 
   else
-     log_failure_msg "\nInterface ${IFACE} doesn't exist."
+     log_failure_msg "Interface ${IFACE} doesn't exist."
      exit 1
   fi
+
+  evaluate_retval
 }
 
@@ -73 +78 @@
 . /lib/lsb/init-functions
 
-log_info_msg "Bringing up the ${1} interface... "
-
 if [ ! -r "${file}" ]; then
-   log_failure_msg2 "${file} is missing or cannot be accessed." 
+   log_failure_msg "Unable to bring up ${1} interface! ${file} is missing or cannot be accessed."
    exit 1
 fi
 
-. $file
+.  $file
 
 if [ "$IFACE" = "" ]; then
-   log_failure_msg2 "${file} does not define an interface [IFACE]."
+   log_failure_msg "Unable to bring up ${1} interface! ${file} does not define an interface [IFACE]."
    exit 1
 fi
@@ -90 +93 @@
 # is not set to yes
 if [ "${IN_BOOT}" = "1" -a "${ONBOOT}" != "yes" ]; then
-   log_skip_msg
    exit 0
+fi
+
+# Bring up the interface
+if [ "$VIRTINT" != "yes" ]; then
+   up ${IFACE}
 fi
 
@@ -111 +118 @@
 done
 
-# Bring up the interface and any components
-for I in $IFACE $INTERFACE_COMPONENTS; do up $I; done
+# Set link up virtual interfaces
+if [ "${VIRTINT}" == "yes" ]; then
+   up ${IFACE}
+fi
+
+# Bring up any additional interface components
+for I in $INTERFACE_COMPONENTS; do up $I; done
 
 # Set MTU if requested. Check if MTU has a "good" value.
@@ -128 +140 @@
 if [ -n "${GATEWAY}" ]; then
    if ip route | grep -q default; then
-      log_skip_msg "\n     Gateway already setup; skipping."
+      log_warning_msg "Gateway already setup; skipping."
    else
-      log_info_msg "Setting up default gateway..."
+      log_info_msg "Adding default gateway ${GATEWAY} to the ${IFACE} interface..."
       ip route add default via ${GATEWAY} dev ${IFACE}
       evaluate_retval