Changeset f42cce0

Timestamp:

02/08/2015 06:17:24 AM (9 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.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:

ad6b72b

Parents:

1e4a180

Message:

Update ifup and ipv4-static to better support multiple IP addresses
on an interface.

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

Files:

• bootscripts/ChangeLog (modified) (1 diff)
• bootscripts/lfs/lib/services/ipv4-static (modified) (1 diff)
• bootscripts/lfs/sbin/ifup (modified) (1 diff)
• bootscripts/lfs/sbin/ifup.8 (modified) (3 diffs)
• chapter01/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

bootscripts/ChangeLog

@@ +1 @@
+2015-02-08 Bruce Dubbs <bdubbs@linuxfromscratch.org>
+   * Modify ipv4-static to support ethernet labels
+   * Output a newline if an interface is skipped during boot
+
 2014-12-24 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    * Clarify rationale for sysklog run levels

bootscripts/lfs/lib/services/ipv4-static

@@ -35 +35 @@
 elif [ -n "${PEER}" ]; then
    args="${args} ${IP} peer ${PEER}"
+fi
+
+if [ -n "${LABEL}" ]; then
+   args="${args} label ${LABEL}"
 fi
 

bootscripts/lfs/sbin/ifup

@@ -91 +91 @@
 if [ "${IN_BOOT}" = "1" -a "${ONBOOT}" != "yes" ]; then
    log_info_msg2 "skipped"
+   echo
    exit 0
 fi

bootscripts/lfs/sbin/ifup.8

@@ -47 +47 @@
 
                 ONBOOT=no
-                IFACE=eth0:2
+                IFACE=eth0
+                LABEL=eth0:2
                 SERVICE=dhcpcd
          
@@ -123 +124 @@
                      specified, is 24.
        
+         LABEL     - The label to be assigned to the interface.  
+                     This is normally specified for assigning
+                     additional IP addresses to a network
+                     device.  Example: eth0:2 (optional)
+       
          BROADCAST - The brodcast address for this interface, 
                      e.g 192.168.1.255.  If not specified, 
@@ -177 +183 @@
        ip(8).
 
-IFUP/IFDOWN                   8 April 2012                 ifup(8)
+IFUP/IFDOWN                   8 February 2015                    ifup(8)

chapter01/changelog.xml

@@ -40 +40 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update ipv4-static, ifup, and ifup.8
+          in bootscripts to better support multiple IP addresses
+          on an interface.</para>
+        </listitem>
+        <listitem>
           <para>[Chris] - Updated FHS URL to new location.</para>
         </listitem>

packages.ent

@@ -353 +353 @@
 <!ENTITY less-ch6-sbu "0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20141224">              <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20150208">              <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">