diff options
| author | Tom Gundersen <teg@jklm.no> | 2011-06-20 20:43:22 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2011-06-20 20:43:22 +0200 |
| commit | 5e4b8e09b2027ec58a089becdc156d6efb5484ed (patch) | |
| tree | 41d7fc953cac66b8f13390be1403c46daf37a280 | |
| parent | 3498c2a1b387fb83a960e6ed1faaa3e5fd68fa50 (diff) | |
| parent | f49bb1f3cbdac7f62c69dbe1b20d87bd77cbcb6b (diff) | |
| download | initscripts-5e4b8e09b2027ec58a089becdc156d6efb5484ed.tar.xz | |
Merge remote-tracking branch 'falconindy/working'
| -rwxr-xr-x | network | 2 | ||||
| -rwxr-xr-x | rc.shutdown | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -292,7 +292,7 @@ case "$1" in ;; ifup|ifdown|iflist|rtup|rtdown|rtlist) # deprecation check - need_legacy && deprecated + deprecated $1 $2 ;; *) diff --git a/rc.shutdown b/rc.shutdown index a040bbe..fc12958 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -47,7 +47,7 @@ halt -w status "Deactivating Swap" swapoff -a # stop monitoring of lvm2 groups before unmounting filesystems -if [[ $USELVM =~ yes|YES && -x $(type -P lvm) && -d /sys/block ]]; then +if [[ $USELVM = [Yy][Ee][Ss] && -x $(type -P lvm) && -d /sys/block ]]; then status "Deactivating monitoring of LVM2 groups" \ vgchange --monitor n >/dev/null 2>&1 fi @@ -66,7 +66,7 @@ if [[ -f /etc/crypttab && -n $CS ]] && 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 + if [[ $USELVM = [Yy][Ee][Ss] ]]; then vgchange --sysinit -a n >/dev/null 2>&1 fi do_lock() { @@ -81,7 +81,7 @@ if [[ -f /etc/crypttab && -n $CS ]] && grep -q ^[^#] /etc/crypttab; then stat_done fi -if [[ $USELVM =~ yes|YES && -x $(type -P lvm) && -d /sys/block ]]; then +if [[ $USELVM = [Yy][Ee][Ss] && -x $(type -P lvm) && -d /sys/block ]]; then status "Deactivating LVM2 groups" vgchange --sysinit -a n >/dev/null 2>&1 fi |