From e04d6599f19532c996f541835d5f8f0aa87b2e3a Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Tue, 26 Apr 2011 00:28:14 +0200 Subject: fixup: umount tmpfs on shutdown As suggested by seblu: - add comment to explain what we unmount and why, and - use /bin/grep rather than grep Also add some more redirects to /dev/null. Signed-off-by: Tom Gundersen --- rc.shutdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'rc.shutdown') diff --git a/rc.shutdown b/rc.shutdown index f847ddf..ec5fb9b 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -54,9 +54,10 @@ if [[ $USELVM =~ yes|YES && -x /sbin/lvm && -d /sys/block ]]; then fi stat_busy "Unmounting Filesystems" -if grep -q devtmpfs /proc/filesystems 2>/dev/null; then +if /bin/grep -q devtmpfs /proc/filesystems &>/dev/null; then /bin/umount -a -r -t nosysfs,noproc,nodevtmpfs,nodevpts -O no_netdev else + # if we don't have devtmpfs support, /dev is mounted as tmpfs, so don't unmount it /bin/umount -a -r -t notmpfs,nosysfs,noproc,nodevpts -O no_netdev fi stat_done -- cgit v1.2.3-54-g00ecf From 8dcc8d0e030aa4b84f02d1a862335afd74b772e8 Mon Sep 17 00:00:00 2001 From: Ian-Xue Li Date: Sat, 30 Apr 2011 21:16:09 +0200 Subject: rc.shutdown should recognize LVM upon LUKS option This fixes FS#23889. Signed-off-by: Tom Gundersen --- rc.shutdown | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'rc.shutdown') diff --git a/rc.shutdown b/rc.shutdown index ec5fb9b..a78bc4d 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -65,6 +65,11 @@ stat_done # Kill non-root encrypted partition mappings if [[ -f /etc/crypttab && -n $CS ]] && /bin/grep -q ^[^#] /etc/crypttab; then stat_busy "Deactivating encrypted volumes:" + # Maybe someone has LVM on an encrypted block device + # executing an extra vgchange is errorless + if [[ $USELVM =~ yes|YES ]]; then + /sbin/vgchange --sysinit -a n >/dev/null 2>&1 + fi do_lock() { stat_append "${1}.." if $CS remove "$1" >/dev/null 2>&1; then -- cgit v1.2.3-54-g00ecf