Changeset 0c5d002 for bootscripts

Timestamp:

08/05/2013 07:38:44 PM (11 years ago)

Author:

Bruce Dubbs <bdubbs@…>

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.4, 7.5, 7.6, 7.7, 7.8, 7.9, 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:

232779f8

Parents:

466dae6

Message:

Update to linux-3.10.5
Fix bootscript ipv4-static-route

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

Location:

bootscripts

Files:

• ChangeLog (modified) (1 diff)
• lfs/lib/services/ipv4-static-route (modified) (2 diffs)
• lfs/sbin/ifup.8 (modified) (2 diffs)

bootscripts/ChangeLog

@@ +1 @@
+2013-08-05 Bruce Dubbs <bdubbs@linuxfromscratch.org>
+   * Use STATIC_GATEWAY for ipv4-static-route purposes
+
 2013-05-15 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    * Remove unneeded options and commands from mountfs and

bootscripts/lfs/lib/services/ipv4-static-route

@@ -44 +44 @@
 esac
 
+if [ -n "${GATEWAY}" ]; then
+   MSG="The GATEWAY variable cannot be set in ${IFCONFIG} for static routes.\n"
+   log_failure_msg "$MSG Use STATIC_GATEWAY only, cannot continue"
+   exit 1
+fi
+
 if [ -n "${need_ip}" ]; then
    if [ -z "${IP}" ]; then
@@ -60 +66 @@
 
 if [ -n "${need_gateway}" ]; then
-   if [ -z "${GATEWAY}" ]; then
-      log_failure_msg "GATEWAY variable missing from ${IFCONFIG}, cannot continue."
+   if [ -z "${STATIC_GATEWAY}" ]; then
+      log_failure_msg "STATIC_GATEWAY variable missing from ${IFCONFIG}, cannot continue."
       exit 1
    fi
-   args="${args} via ${GATEWAY}"
+   args="${args} via ${STATIC_GATEWAY}"
 fi
 

bootscripts/lfs/sbin/ifup.8

@@ -100 +100 @@
                  route or on a local network, e.g., 192.168.1.1.  
                  For secondary IP addresses on an interface, this 
-                 parameter should not be specified.
+                 parameter should not be specified.  If the service
+                 is ipv4-static-route, this parameter must NOT
+                 be set.
+
+       STATIC_GATEWAY - The default IP address to use for routing
+                 when setting a static routing address.  
 
        INTERFACE_COMPONENTS - A list of component interfaces
@@ -133 +138 @@
          PREFIX  -  The prefix for the associated IP address.
 
-         GATEWAY -  The IP address for a network route.
+         STATIC_GATEWAY - The IP address for a network route.
 
          SOURCE  -  The source IP address to prefer when sending