fix xendomains service

diff -r 37c77bacb52a -r be4f09fff517 tools/hotplug/Linux/init.d/xendomains
@@ -204,15 +204,21 @@ rdnames()
 
 parseln()
 {
-    if [[ "$1" =~ '(domain' ]]; then
+    domain_re="\(domain"
+    name_re="\(name"
+    domid_re="\(domid"
+    state_re="\(state"
+    if [[ "$1" =~ $domain_re ]]; then
         name=;id=
-    else if [[ "$1" =~ '(name' ]]; then
+    else if [[ "$1" =~ $name_re ]]; then
         name=$(echo $1 | sed -e 's/^.*(name \(.*\))$/\1/')
-    else if [[ "$1" =~ '(domid' ]]; then
+    else if [[ "$1" =~ $domid_re ]]; then
         id=$(echo $1 | sed -e 's/^.*(domid \(.*\))$/\1/')
-    fi; fi; fi
+    else if [[ "$1" =~ $state_re ]]; then
+        state=$(echo $1 | sed -e 's/^.*(state \(.*\))$/\1/')
+    fi; fi; fi; fi
 
-    [ -n "$name" -a -n "$id" ] && return 0 || return 1
+    [ -n "$name" -a -n "$id" -a -n "$state" ] && return 0 || return 1
 }
 
 is_running()

@@ -228,7 +234,7 @@ is_running()
 		RC=0
 		;;
 	esac
-    done < <($CMD list -l | grep '(\(domain\|domid\|name\)')
+    done < <($CMD list -l | grep '(\(domain\|domid\|name\|state\)')
     return $RC
 }
 

@@ -310,7 +316,7 @@ all_zombies()
 	if test "$state" != "-b---d" -a "$state" != "-----d"; then
 	    return 1;
 	fi
-    done < <($CMD list -l | grep '(\(domain\|domid\|name\)')
+    done < <($CMD list -l | grep '(\(domain\|domid\|name\|state\)')
     return 0
 }
 

@@ -441,7 +447,7 @@ stop()
 	    fi
 	    kill $WDOG_PID >/dev/null 2>&1
 	fi
-    done < <($CMD list -l | grep '(\(domain\|domid\|name\)')
+    done < <($CMD list -l | grep '(\(domain\|domid\|name\|state\)')
 
     # NB. this shuts down ALL Xen domains (politely), not just the ones in
     # AUTODIR/*

@@ -478,7 +484,7 @@ check_domain_up()
 		return 0
 		;;
 	esac
-    done < <($CMD list -l | grep '(\(domain\|domid\|name\)')
+    done < <($CMD list -l | grep '(\(domain\|domid\|name\|state\)')
     return 1
 }

diff -r be4f09fff517 -r 4982815ee816 tools/hotplug/Linux/init.d/xendomains
@@ -365,17 +365,15 @@ stop()
 	if test $id = 0; then continue; fi
 	echo -n " $name"
 	if test "$XENDOMAINS_AUTO_ONLY" = "true"; then
-	    eval "
-	    case \"\$name\" in
-		($NAMES)
+	    case "$name" in
+		$NAMES)
 		    # nothing
 		    ;;
-		(*)
+		*)
 		    echo -e '(skip)'
 		    continue
 		    ;;
 	    esac
-	    "
 	fi
 	# XENDOMAINS_SYSRQ chould be something like just "s" 
 	# or "s e i u" or even "s e s i u o"

diff -r 4982815ee816 -r b944852b9789 tools/hotplug/Linux/init.d/sysconfig.xendomains
@@ -103,7 +103,7 @@ XENDOMAINS_RESTORE=true
 XENDOMAINS_AUTO=/etc/xen/auto
 
 ## Type: boolean
-## Default: false
+## Default: true
 # 
 # If this variable is set to "true", only the domains started via config 
 # files in XENDOMAINS_AUTO will be treated according to XENDOMAINS_SYSRQ,

@@ -111,7 +111,7 @@ XENDOMAINS_AUTO=/etc/xen/auto
 # all running domains will be. 
 # Note that the name matching is somewhat fuzzy.
 # 
-XENDOMAINS_AUTO_ONLY=false
+XENDOMAINS_AUTO_ONLY=true
 
 ## Type: integer
 ## Default: 300

diff -r b944852b9789 -r ab0a7d100668 tools/hotplug/Linux/init.d/xendomains
@@ -249,8 +249,6 @@ start()
     if [ "$XENDOMAINS_RESTORE" = "true" ] &&
        contains_something "$XENDOMAINS_SAVE"
     then
-	mkdir -p $(dirname "$LOCKFILE")
-	touch $LOCKFILE
 	echo -n "Restoring Xen domains:"
 	saved_domains=`ls $XENDOMAINS_SAVE`
         for dom in $XENDOMAINS_SAVE/*; do

@@ -276,7 +274,6 @@ start()
 
     if contains_something "$XENDOMAINS_AUTO"
     then
-	touch $LOCKFILE
 	echo -n "Starting auto Xen domains:"
 	# We expect config scripts for auto starting domains to be in
 	# XENDOMAINS_AUTO - they could just be symlinks to files elsewhere

@@ -305,6 +302,8 @@ start()
 	    fi
 	done
     fi
+	mkdir -p $(dirname "$LOCKFILE")
+	touch $LOCKFILE
 }
 
 all_zombies()