diff options
Diffstat (limited to 'bootscripts')
| -rw-r--r-- | bootscripts/ChangeLog | 7 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/mountfs | 3 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/mountvirtfs | 7 |
3 files changed, 14 insertions, 3 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index a2eb6c439..a9ee10ef6 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,10 @@ +2012-06-17 Bruce Dubbs <bdubbs@linuxfromscratch.org> + * Only mount /run in mountvirtfs if it is not already mounted + (from an initrd). + * Force the /dev/shm->/run/shm symlink + * Skip making LVM virtual groups unavailable at shutdown + because the / or swap partitions may be still in use. + 2012-05-30 Bruce Dubbs <bdubbs@linuxfromscratch.org> * Copy all entries in /lib/udev/devices to /dev in mounvirtfs diff --git a/bootscripts/lfs/init.d/mountfs b/bootscripts/lfs/init.d/mountfs index 0d3f2c78d..47c21bc33 100644 --- a/bootscripts/lfs/init.d/mountfs +++ b/bootscripts/lfs/init.d/mountfs @@ -66,7 +66,8 @@ case "${1}" in evaluate_retval # Make all LVM volume groups unavailable, if appropriate - if [ -x /sbin/vgchange ]; then /sbin/vgchange -an > /dev/null; fi + # This fails if swap or / are on an LVM partition + #if [ -x /sbin/vgchange ]; then /sbin/vgchange -an > /dev/null; fi ;; *) diff --git a/bootscripts/lfs/init.d/mountvirtfs b/bootscripts/lfs/init.d/mountvirtfs index fab73d5b6..6130c0198 100644 --- a/bootscripts/lfs/init.d/mountvirtfs +++ b/bootscripts/lfs/init.d/mountvirtfs @@ -32,7 +32,10 @@ case "${1}" in start) # Make sure /run/var is available before logging any messages - mount -n /run || failed=1 + if ! mountpoint /sys >/dev/null; then + mount -n /run || failed=1 + fi + mkdir -p /run/var /run/lock /run/shm chmod 1777 /run/shm @@ -56,7 +59,7 @@ case "${1}" in # Copy devices that Udev >= 155 doesn't handle to /dev cp -a /lib/udev/devices/* /dev - ln -s /run/shm /dev/shm + ln -sfn /run/shm /dev/shm (exit ${failed}) evaluate_retval |