diff options
| -rw-r--r-- | bootscripts/ChangeLog | 3 | ||||
| -rwxr-xr-x | bootscripts/lfs/lib/services/ipv4-static-route | 12 | ||||
| -rw-r--r-- | bootscripts/lfs/sbin/ifup.8 | 9 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 13 | ||||
| -rw-r--r-- | chapter06/creatingdirs.xml | 2 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | packages.ent | 8 |
7 files changed, 39 insertions, 12 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index c6569f092..b28854c3c 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,6 @@ +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 mountvirtfs when mtab is a symlink to /proc/self/mounts diff --git a/bootscripts/lfs/lib/services/ipv4-static-route b/bootscripts/lfs/lib/services/ipv4-static-route index c4d433d2a..293ca44a5 100755 --- a/bootscripts/lfs/lib/services/ipv4-static-route +++ b/bootscripts/lfs/lib/services/ipv4-static-route @@ -43,6 +43,12 @@ case "${TYPE}" in ;; 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 log_failure_msg "IP variable missing from ${IFCONFIG}, cannot continue." @@ -59,11 +65,11 @@ if [ -n "${need_ip}" ]; then fi 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 if [ -n "${SOURCE}" ]; then diff --git a/bootscripts/lfs/sbin/ifup.8 b/bootscripts/lfs/sbin/ifup.8 index 8ed0d9586..7c3a007d6 100644 --- a/bootscripts/lfs/sbin/ifup.8 +++ b/bootscripts/lfs/sbin/ifup.8 @@ -99,7 +99,12 @@ NOTES the destination IP address is not in a static 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 only needed for a compound device such as a bridge. @@ -132,7 +137,7 @@ NOTES 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 to the destinations covered by the specified diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 922becb6b..f06593157 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,19 @@ <para>2013-08-02</para> <itemizedlist> <listitem> + <para>[bdubbs] - Update to linux-3.10.5.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to lfs-bootscripts-20130805. Fixes + an issue with ipv4-static-route.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> + <para>2013-08-02</para> + <itemizedlist> + <listitem> <para>[bdubbs] - Update to util-linux-2.23.2. Fixes <ulink url="&lfs-ticket-root;3386">#3386</ulink>.</para> </listitem> diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml index 121a2c8f5..aec7d25ec 100644 --- a/chapter06/creatingdirs.xml +++ b/chapter06/creatingdirs.xml @@ -25,7 +25,7 @@ for dir in /usr /usr/local; do ln -sv share/{man,doc,info} $dir done case $(uname -m) in - x86_64) ln -sv lib /lib64 && ln -sv lib /usr/lib64 ;; + x86_64) ln -sv lib /lib64 && ln -sv lib /usr/lib64 && ln -sv lib /usr/local/lib64 ;; esac mkdir -v /var/{log,mail,spool} ln -sv /run /var/run diff --git a/general.ent b/general.ent index 2d0019c8c..4a78ad33a 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-201308.02"> -<!ENTITY releasedate "August 2, 2013"> +<!ENTITY version "SVN-20130805"> +<!ENTITY releasedate "August 5, 2013"> <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.4"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/packages.ent b/packages.ent index 0a07e300e..7396fd836 100644 --- a/packages.ent +++ b/packages.ent @@ -310,7 +310,7 @@ <!ENTITY less-ch6-du "3.6 MB"> <!ENTITY less-ch6-sbu "less than 0.1 SBU"> -<!ENTITY lfs-bootscripts-version "20130515"> <!-- Scripts depend on this format --> +<!ENTITY lfs-bootscripts-version "20130805"> <!-- 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 --> @@ -339,12 +339,12 @@ <!ENTITY linux-major-version "3"> <!ENTITY linux-minor-version "10"> -<!ENTITY linux-patch-version "4"> +<!ENTITY linux-patch-version "5"> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> -<!ENTITY linux-size "71,840 KB"> +<!ENTITY linux-size "71,496 KB"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> -<!ENTITY linux-md5 "0378156d0a4ebf155d083531c3cb3826"> +<!ENTITY linux-md5 "853d4bca2752a7ec6ca11a14d557d691"> <!ENTITY linux-home "http://www.kernel.org/"> <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is allnoconfig extended for a hopefully-bootable build on desktop machine, |