Changeset c899581

Timestamp:

03/22/2012 09:30:39 PM (12 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

e77cfbf

Parents:

2423c94

Message:

Bootscript enhancements

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9783 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• bootscripts/lfs/init.d/checkfs (modified) (1 diff)
• bootscripts/lfs/init.d/udev (modified) (1 diff)
• bootscripts/lfs/lib/services/ipv4-static (modified) (2 diffs)
• chapter01/changelog.xml (modified) (2 diffs)
• general.ent (modified) (1 diff)
• packages.ent (modified) (1 diff)

bootscripts/lfs/init.d/checkfs

@@ -43 +43 @@
 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 "

bootscripts/lfs/init.d/udev

@@ -59 +59 @@
       # 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 
       ;;

bootscripts/lfs/lib/services/ipv4-static

@@ -43 +43 @@
 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
@@ -70 +70 @@
 
    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}

chapter01/changelog.xml

@@ -37 +37 @@
 
 -->
+    <listitem>
+      <para>2012-03-22</para>
+      <itemizedlist>
+         <listitem>
+           <para>[bdubbs] - Fix corner case in ipv4-static script. </para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
@@ -52 +60 @@
            <para>[matthew] - Upgrade to Udev-182. Fixes
            <ulink url="&lfs-ticket-root;3040">#3040</ulink>.</para>
+         </listitem>
+      </itemizedlist>
+    </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>

general.ent

@@ -1 @@
-<!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 &ndash; -->
 <!ENTITY milestone "7.2">

packages.ent

@@ -306 +306 @@
 <!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">