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
This commit is contained in:
Bruce Dubbs 2013-08-05 19:38:44 +00:00
parent 466dae654d
commit 0c5d0027b8
7 changed files with 39 additions and 12 deletions

View File

@ -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> 2013-05-15 Bruce Dubbs <bdubbs@linuxfromscratch.org>
* Remove unneeded options and commands from mountfs and * Remove unneeded options and commands from mountfs and
mountvirtfs when mtab is a symlink to /proc/self/mounts mountvirtfs when mtab is a symlink to /proc/self/mounts

View File

@ -43,6 +43,12 @@ case "${TYPE}" in
;; ;;
esac 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 [ -n "${need_ip}" ]; then
if [ -z "${IP}" ]; then if [ -z "${IP}" ]; then
log_failure_msg "IP variable missing from ${IFCONFIG}, cannot continue." log_failure_msg "IP variable missing from ${IFCONFIG}, cannot continue."
@ -59,11 +65,11 @@ if [ -n "${need_ip}" ]; then
fi fi
if [ -n "${need_gateway}" ]; then if [ -n "${need_gateway}" ]; then
if [ -z "${GATEWAY}" ]; then if [ -z "${STATIC_GATEWAY}" ]; then
log_failure_msg "GATEWAY variable missing from ${IFCONFIG}, cannot continue." log_failure_msg "STATIC_GATEWAY variable missing from ${IFCONFIG}, cannot continue."
exit 1 exit 1
fi fi
args="${args} via ${GATEWAY}" args="${args} via ${STATIC_GATEWAY}"
fi fi
if [ -n "${SOURCE}" ]; then if [ -n "${SOURCE}" ]; then

View File

@ -99,7 +99,12 @@ NOTES
the destination IP address is not in a static the destination IP address is not in a static
route or on a local network, e.g., 192.168.1.1. route or on a local network, e.g., 192.168.1.1.
For secondary IP addresses on an interface, this 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 INTERFACE_COMPONENTS - A list of component interfaces
only needed for a compound device such as a bridge. only needed for a compound device such as a bridge.
@ -132,7 +137,7 @@ NOTES
PREFIX - The prefix for the associated IP address. 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 SOURCE - The source IP address to prefer when sending
to the destinations covered by the specified to the destinations covered by the specified

View File

@ -35,6 +35,19 @@
</itemizedlist> </itemizedlist>
</listitem> </listitem>
--> -->
<listitem>
<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> <listitem>
<para>2013-08-02</para> <para>2013-08-02</para>
<itemizedlist> <itemizedlist>

View File

@ -25,7 +25,7 @@ for dir in /usr /usr/local; do
ln -sv share/{man,doc,info} $dir ln -sv share/{man,doc,info} $dir
done done
case $(uname -m) in case $(uname -m) in
x86_64) ln -sv lib /lib64 &amp;&amp; ln -sv lib /usr/lib64 ;; x86_64) ln -sv lib /lib64 &amp;&amp; ln -sv lib /usr/lib64 &amp;&amp; ln -sv lib /usr/local/lib64 ;;
esac esac
mkdir -v /var/{log,mail,spool} mkdir -v /var/{log,mail,spool}
ln -sv /run /var/run ln -sv /run /var/run

View File

@ -1,5 +1,5 @@
<!ENTITY version "SVN-201308.02"> <!ENTITY version "SVN-20130805">
<!ENTITY releasedate "August 2, 2013"> <!ENTITY releasedate "August 5, 2013">
<!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; --> <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.4"> <!ENTITY milestone "7.4">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

View File

@ -310,7 +310,7 @@
<!ENTITY less-ch6-du "3.6 MB"> <!ENTITY less-ch6-du "3.6 MB">
<!ENTITY less-ch6-sbu "less than 0.1 SBU"> <!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-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 -->
@ -339,12 +339,12 @@
<!ENTITY linux-major-version "3"> <!ENTITY linux-major-version "3">
<!ENTITY linux-minor-version "10"> <!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;.&linux-patch-version;">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-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-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/"> <!ENTITY linux-home "http://www.kernel.org/">
<!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine, allnoconfig extended for a hopefully-bootable build on desktop machine,