From cc514f32d04194198e42a63d24ce2e5e9b3df031 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sun, 19 Jun 2011 13:15:57 -0400 Subject: rc.shutdown: continuation of fe48fab2c2c35c Signed-off-by: Dave Reisner --- rc.shutdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 -- cgit v1.2.3 From f49bb1f3cbdac7f62c69dbe1b20d87bd77cbcb6b Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Mon, 20 Jun 2011 13:54:39 -0400 Subject: network: always warn about deprecation for old funcs There's no way the ifup|ifdown|rtup|rtdown etc functions will ever hit the new iproute2 based logic. Therefore, always remind the user that this functionality is deprecated. This prevents misusage of the functionality as seen in FS#24714. Signed-off-by: Dave Reisner --- network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network b/network index 0177c04..74fc3d1 100755 --- a/network +++ b/network @@ -292,7 +292,7 @@ case "$1" in ;; ifup|ifdown|iflist|rtup|rtdown|rtlist) # deprecation check - need_legacy && deprecated + deprecated $1 $2 ;; *) -- cgit v1.2.3