From c2441712081015c57aabeca637eb230055a67ba3 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 25 Sep 2007 20:05:56 +0000
Subject: more fixes (#220087)

---
 rc.d/init.d/functions | 2 +-
 rc.d/init.d/halt      | 2 +-
 rc.d/init.d/network   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index e85cff20..4740b9bd 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -569,7 +569,7 @@ resolve_dm_name() {
         egrep -iv "no block devices found|No RAID disks" | \
         awk -F ':' "{ if (\$1 ~ /^$name$/) { print \$2; }}")
     for x in $line ; do
-        if [[ "$x" =~ "^/dev/" ]] ; then
+        if [[ "$x" =~ ^/dev/ ]] ; then
             majmin=$(get_numeric_dev dec $x)
             line=$(echo "$line" | sed -e "s,$x\( \|$\),$majmin\1,g")
         fi
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index a6d719ef..56a59012 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -138,7 +138,7 @@ tmpfs=$(awk '$2 ~ /^\/($|proc|dev)/ { next; }
 if [ -n "$SWAPS" ]; then
     action $"Turning off swap: " swapoff $SWAPS
     for dst in $SWAPS; do
-	if [[ "$dst" =~ "^/dev/mapper" ]] \
+	if [[ "$dst" =~ ^/dev/mapper ]] \
 	    && [ "$(dmsetup status "$dst" | cut -d ' ' -f 3)" = crypt ]; then
 	    backdev=$(/sbin/cryptsetup status "$dst" \
 		| awk '$1 == "device:" { print $2 }')
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 86069164..60a0a8dd 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -171,7 +171,7 @@ case "$1" in
         rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' /etc/mtab)
         rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' /etc/mtab)
 	
-	if [[ "$rootfs" =~ "^nfs" ]] || [[ "$rootopts" =~ "_netdev" ]] ; then
+	if [[ "$rootfs" =~ ^nfs ]] || [[ "$rootopts" =~ "_netdev" ]] ; then
 		exit 1
 	fi
   
-- 
cgit v1.2.1