Xendomains was not correctly suspending domains when a STOP was issued.

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>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
This commit is contained in:
Ian Murray authored and Ian Campbell committed 2013-06-27 11:55:43 +01:00
1 parent 442ba0b2f6
commit 543a265718
1 file changed
+5 -5
+5 -5
View File
@@ -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
}
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.