diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-05-04 14:54:19 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-05-04 14:54:19 -0300 |
| commit | 0363775a534e231ae1b906079ddf980a08a8de67 (patch) | |
| tree | 931a85ee516ed8b61604f4533332d7dff7ec46d5 /rc.shutdown | |
| parent | 5b36b462c671956e2b40e8631b59d96d044df513 (diff) | |
| parent | e98a352e9568ec31b33af8671987d026f1f73647 (diff) | |
Merge branch 'master' of https://projects.archlinux.org/git/initscripts into parabola
Diffstat (limited to 'rc.shutdown')
| -rwxr-xr-x | rc.shutdown | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/rc.shutdown b/rc.shutdown index f847ddf..a78bc4d 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 @@ -64,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 |