gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-05 22:04:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bootscript enhancements

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9783 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Bruce Dubbs 2012-03-22 21:30:39 +00:00
parent 2423c94f0b
commit c8995814d1
6 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bootscripts/lfs/init.d/checkfs
View File

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

5
bootscripts/lfs/init.d/udev
View File

@ -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
;;

4
bootscripts/lfs/lib/services/ipv4-static
View File

@ -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

19
chapter01/changelog.xml
View File

@ -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>
@ -55,6 +63,17 @@
</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>
</listitem>
<listitem>
<para>2012-03-14</para>
<itemizedlist>

4
general.ent
View File

@ -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 &ndash; -->
<!ENTITY milestone "7.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

2
packages.ent
View File

@ -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 -->