All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Xendomains was not correctly suspending domains when a STOP was issued.
@ 2013-06-22 12:38 Ian Murray
  2013-06-24 10:50 ` George Dunlap
                   ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: Ian Murray @ 2013-06-22 12:38 UTC (permalink / raw)
  To: xen-devel; +Cc: Ian Murray, Ian.Campbell

The regex was not selecting the { when parsing JSON output of xl list -l.
It was also not selecting (domain when parsing xl list -l when SXP selected.

Pefixed { with 4 spaces, and removed an extra ( before domain in the regex
string

Added quotes around the grep strings so the spaces inserted into the string
didn't not break the grepping.

This has now been tested against 4.3RC5

Signed-off-by: Ian Murray <murrayie@yahoo.co.uk>
---
 tools/hotplug/Linux/init.d/xendomains |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains
index 730541e..38371af 100644
--- a/tools/hotplug/Linux/init.d/xendomains
+++ b/tools/hotplug/Linux/init.d/xendomains
@@ -206,7 +206,7 @@ rdnames()
     done
 }
 
-LIST_GREP='((domain\|(domid\|(name\|^{$\|"name":\|"domid":'
+LIST_GREP='(domain\|(domid\|(name\|^    {$\|"name":\|"domid":'
 parseln()
 {
     if [[ "$1" =~ '(domain' ]] || [[ "$1" = "{" ]]; then
@@ -237,7 +237,7 @@ is_running()
 		RC=0
 		;;
 	esac
-    done < <($CMD list -l | grep $LIST_GREP)
+    done < <($CMD list -l | grep "$LIST_GREP")
     return $RC
 }
 
@@ -319,7 +319,7 @@ all_zombies()
 	if test "$state" != "-b---d" -a "$state" != "-----d"; then
 	    return 1;
 	fi
-    done < <($CMD list -l | grep $LIST_GREP)
+    done < <($CMD list -l | grep "$LIST_GREP")
     return 0
 }
 
@@ -450,7 +450,7 @@ stop()
 	    fi
 	    kill $WDOG_PID >/dev/null 2>&1
 	fi
-    done < <($CMD list -l | grep $LIST_GREP)
+    done < <($CMD list -l | grep "$LIST_GREP")
 
     # NB. this shuts down ALL Xen domains (politely), not just the ones in
     # AUTODIR/*
@@ -487,7 +487,7 @@ check_domain_up()
 		return 0
 		;;
 	esac
-    done < <($CMD list -l | grep $LIST_GREP)
+    done < <($CMD list -l | grep "$LIST_GREP")
     return 1
 }
 
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2013-06-27 13:06 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-22 12:38 [PATCH] Xendomains was not correctly suspending domains when a STOP was issued Ian Murray
2013-06-24 10:50 ` George Dunlap
2013-06-24 14:36   ` Ian Murray
2013-06-26 21:41 ` [PATCH] [Reminder] " Ian Murray
2013-06-27  8:07   ` Ian Campbell
2013-06-27 11:32 ` [PATCH] " Ian Campbell
2013-06-27 11:51   ` Ian Murray
2013-06-27 11:59     ` Ian Campbell
2013-06-27 12:15       ` Ian Murray
2013-06-27 12:19         ` Ian Campbell
2013-06-27 12:30           ` Ian Murray
2013-06-27 13:06             ` Ian Campbell

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.