diff options
| -rw-r--r-- | bootscripts/lfs/init.d/checkfs | 7 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/udev | 5 | ||||
| -rwxr-xr-x | bootscripts/lfs/lib/services/ipv4-static | 4 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 19 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | packages.ent | 2 |
6 files changed, 29 insertions, 12 deletions
diff --git a/bootscripts/lfs/init.d/checkfs b/bootscripts/lfs/init.d/checkfs index 963ec41a0..ef96aaf0f 100644 --- a/bootscripts/lfs/init.d/checkfs +++ b/bootscripts/lfs/init.d/checkfs @@ -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" diff --git a/bootscripts/lfs/init.d/udev b/bootscripts/lfs/init.d/udev index 49a1e4e9a..1246d6dad 100644 --- a/bootscripts/lfs/init.d/udev +++ b/bootscripts/lfs/init.d/udev @@ -58,6 +58,11 @@ case "${1}" in # 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 ;; diff --git a/bootscripts/lfs/lib/services/ipv4-static b/bootscripts/lfs/lib/services/ipv4-static index 16c5e473e..cb9649d4b 100755 --- a/bootscripts/lfs/lib/services/ipv4-static +++ b/bootscripts/lfs/lib/services/ipv4-static @@ -42,7 +42,7 @@ fi 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 @@ case "${2}" in ;; 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 diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 85d8e7bfe..04c34ac02 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -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> diff --git a/general.ent b/general.ent index 5b498b53c..b5cab350f 100644 --- a/general.ent +++ b/general.ent @@ -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}]" --> diff --git a/packages.ent b/packages.ent index a5d1ad6bc..a768d35e4 100644 --- a/packages.ent +++ b/packages.ent @@ -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 --> |