Author: bdubbs
Date: 2012-03-22 15:30:39 -0600 (Thu, 22 Mar 2012)
New Revision: 9783
Modified:
trunk/BOOK/bootscripts/lfs/init.d/checkfs
trunk/BOOK/bootscripts/lfs/init.d/udev
trunk/BOOK/bootscripts/lfs/lib/services/ipv4-static
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/general.ent
trunk/BOOK/packages.ent
Log:
Bootscript enhancements
Modified: trunk/BOOK/bootscripts/lfs/init.d/checkfs
===================================================================
--- trunk/BOOK/bootscripts/lfs/init.d/checkfs 2012-03-20 21:16:26 UTC (rev
9782)
+++ trunk/BOOK/bootscripts/lfs/init.d/checkfs 2012-03-22 21:30:39 UTC (rev
9783)
@@ -42,13 +42,6 @@
case "${1}" in
start)
-
- # If any LVM based partitions are on the system, ensure they
- # are activated so they can be checked/used.
- if [ -x /sbin/vgchange ]; then
- /sbin/vgchange -a y >/dev/null
- fi
-
if [ -f /fastboot ]; then
msg="/fastboot found, will omit "
msg="${msg} file system checks as requested.\n"
Modified: trunk/BOOK/bootscripts/lfs/init.d/udev
===================================================================
--- trunk/BOOK/bootscripts/lfs/init.d/udev 2012-03-20 21:16:26 UTC (rev
9782)
+++ trunk/BOOK/bootscripts/lfs/init.d/udev 2012-03-22 21:30:39 UTC (rev
9783)
@@ -58,6 +58,11 @@
# Now wait for udevd to process the uevents we triggered
/sbin/udevadm settle
+
+ # If any LVM based partitions are on the system, ensure they
+ # are activated so they can be used.
+ if [ -x /sbin/vgchange ]; then /sbin/vgchange -a y >/dev/null; fi
+
log_success_msg2
;;
Modified: trunk/BOOK/bootscripts/lfs/lib/services/ipv4-static
===================================================================
--- trunk/BOOK/bootscripts/lfs/lib/services/ipv4-static 2012-03-20 21:16:26 UTC
(rev 9782)
+++ trunk/BOOK/bootscripts/lfs/lib/services/ipv4-static 2012-03-22 21:30:39 UTC
(rev 9783)
@@ -42,7 +42,7 @@
case "${2}" in
up)
- if [ "$(ip addr show ${1} 2>/dev/null | grep ${IP})" == "" ]; then
+ if [ "$(ip addr show ${1} 2>/dev/null | grep ${IP}/)" == "" ]; then
# Cosmetic output not needed for multiple services
if ! $(echo ${SERVICE} | grep -q " "); then
@@ -69,7 +69,7 @@
;;
down)
- if [ "$(ip addr show ${1} 2>/dev/null | grep ${IP})" != "" ]; then
+ if [ "$(ip addr show ${1} 2>/dev/null | grep ${IP}/)" != "" ]; then
log_info_msg "Removing IPv4 address ${IP} from the ${1} interface..."
ip addr del ${args} dev ${1}
evaluate_retval
Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml 2012-03-20 21:16:26 UTC (rev 9782)
+++ trunk/BOOK/chapter01/changelog.xml 2012-03-22 21:30:39 UTC (rev 9783)
@@ -36,6 +36,14 @@
</listitem>
-->
+ <listitem>
+ <para>2012-03-22</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Fix corner case in ipv4-static script. </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>2012-03-20</para>
@@ -56,6 +64,17 @@
</listitem>
<listitem>
+ <para>2012-03-19</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Move optional LVM initialization to the end
+ of the udev boot script so an LVM partition can be used for swap.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2012-03-14</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-03-20 21:16:26 UTC (rev 9782)
+++ trunk/BOOK/general.ent 2012-03-22 21:30:39 UTC (rev 9783)
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120320">
-<!ENTITY releasedate "Mar 20, 2012">
+<!ENTITY version "SVN-20120322">
+<!ENTITY releasedate "Mar 22, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not
– -->
<!ENTITY milestone "7.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or
"x.y[-pre{x}]" -->
Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent 2012-03-20 21:16:26 UTC (rev 9782)
+++ trunk/BOOK/packages.ent 2012-03-22 21:30:39 UTC (rev 9783)
@@ -305,7 +305,7 @@
<!ENTITY less-ch6-du "3.5 MB">
<!ENTITY less-ch6-sbu "less than 0.1 SBU">
-<!ENTITY lfs-bootscripts-version "20120229"> <!-- Scripts
depend on this format -->
+<!ENTITY lfs-bootscripts-version "20120322"> <!-- 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 -->
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
