diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2012-03-22 21:30:39 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2012-03-22 21:30:39 +0000 |
| commit | c8995814d1950d124de2ffc75d97b31c67c58b4c (patch) | |
| tree | 6e509b277a31b69de745776bf385ce085ec6259a /bootscripts | |
| parent | 2423c94f0b13767cb1500c4f37a084e0dc9855cf (diff) | |
Bootscript enhancements
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9783 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'bootscripts')
| -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 |
3 files changed, 7 insertions, 9 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 |