gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update ifup and ipv4-static to better support multiple IP addresses

Browse Source 
on an interface.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10838 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Bruce Dubbs 2015-02-08 06:17:24 +00:00
parent 1e4a180565
commit f42cce0d57
6 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bootscripts/ChangeLog
View File

@ -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> 2014-12-24 Bruce Dubbs <bdubbs@linuxfromscratch.org>
* Clarify rationale for sysklog run levels * Clarify rationale for sysklog run levels

4
bootscripts/lfs/lib/services/ipv4-static
View File

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

1
bootscripts/lfs/sbin/ifup
View File

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

10
bootscripts/lfs/sbin/ifup.8
View File

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

5
chapter01/changelog.xml
View File

@ -38,6 +38,11 @@
<listitem> <listitem>
<para>2015-02-08</para> <para>2015-02-08</para>
<itemizedlist> <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> <listitem>
<para>[Chris] - Updated FHS URL to new location.</para> <para>[Chris] - Updated FHS URL to new location.</para>
</listitem> </listitem>

2
packages.ent
View File

@ -352,7 +352,7 @@
<!ENTITY less-ch6-du "3.6 MB"> <!ENTITY less-ch6-du "3.6 MB">
<!ENTITY less-ch6-sbu "0.1 SBU"> <!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-size "BOOTSCRIPTS-SIZE KB"> <!-- Updated in Makefile -->
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2"> <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in Makefile --> <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in Makefile -->