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

bootscripts/ChangeLog

@@ -1,3 +1,7 @@
+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

@@ -36,6 +36,10 @@ elif [ -n "${PEER}" ]; then
    args="${args} ${IP} peer ${PEER}"
 fi
 
+if [ -n "${LABEL}" ]; then
+   args="${args} label ${LABEL}"
+fi
+
 if [ -n "${BROADCAST}" ]; then
    args="${args} broadcast ${BROADCAST}"
 fi

bootscripts/lfs/sbin/ifup

@@ -90,6 +90,7 @@ fi
 # is not set to yes
 if [ "${IN_BOOT}" = "1" -a "${ONBOOT}" != "yes" ]; then
    log_info_msg2 "skipped"
+   echo
    exit 0
 fi
 

bootscripts/lfs/sbin/ifup.8

@@ -46,7 +46,8 @@ EXAMPLES
               /etc/sysconfig/ifconfig.eth0:2
 
                 ONBOOT=no
-                IFACE=eth0:2
+                IFACE=eth0
+                LABEL=eth0:2
                 SERVICE=dhcpcd
          
                 DHCP_START="--waitip"
@@ -122,6 +123,11 @@ NOTES
                      number of the interface.  The default, if not
                      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, 
                      the broadcast address will be calculated
@@ -176,4 +182,4 @@ AUTHORS
 SEE ALSO
        ip(8).
 
-IFUP/IFDOWN                   8 April 2012                 ifup(8)
+IFUP/IFDOWN                   8 February 2015                    ifup(8)

chapter01/changelog.xml

@@ -38,6 +38,11 @@
     <listitem>
       <para>2015-02-08</para>
       <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

@@ -352,7 +352,7 @@
 <!ENTITY less-ch6-du "3.6 MB">
 <!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">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->