diff options
| author | John Weekes <lists.xen@nuclearfallout.net> | 2011-01-14 08:04:48 +0000 |
|---|---|---|
| committer | John Weekes <lists.xen@nuclearfallout.net> | 2011-01-14 08:04:48 +0000 |
| commit | 23893ac158565900fba322f3279b57e3383bd0b4 (patch) | |
| tree | a9dd13647ff5371726aabde9dd16d38a268d0372 | |
| parent | c130c86b6ed64d370ac3f3b4cb7e8057032a6071 (diff) | |
| download | xen-23893ac158565900fba322f3279b57e3383bd0b4.tar.gz xen-23893ac158565900fba322f3279b57e3383bd0b4.tar.bz2 xen-23893ac158565900fba322f3279b57e3383bd0b4.zip | |
stubdom: Fix stubdom-dm using "grep" improperly
stubdom-dm uses "grep" on "xm list" output to determine whether it is
already running. The existing behavior is to use "grep $domname-dm"
but this will result in a false-positive in the case of another domU
running whose name ends with the full new name; for instance, if
"abctest-dm" is running, a new "test-dm" will spin forever, waiting
for it the end.
Any easy fix is to have it use "grep -w" instead of "grep", searching
for the whole word only.
It also might be worth considering a switch to "xl list" from "xm
list", here and in other places.
Signed-off-by: John Weekes <lists.xen@nuclearfallout.net>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
xen-unstable changeset: 22714:6852e3e7ef58
xen-unstable date: Tue Jan 11 16:42:41 2011 +0000
| -rw-r--r-- | stubdom/stubdom-dm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stubdom/stubdom-dm b/stubdom/stubdom-dm index c85fa53635..05d07ac0d1 100644 --- a/stubdom/stubdom-dm +++ b/stubdom/stubdom-dm @@ -91,7 +91,7 @@ trap term SIGHUP ############ # stubdomain # Wait for any previous stubdom to terminate -while xm list | grep $domname-dm +while xm list | grep -w $domname-dm do sleep 1 done |