tags 661687 +patch thanks On Thursday 01 March 2012 12:04 AM, Ritesh Raj Sarraf wrote: > /etc/default/xen, which carries the TOOLSTACK setting, is not honored by xend > init script. > > The xend initscript doesn't check for the value of TOOLSTACK. It just > populates it in its initscript. > > lnx200-39:/etc/init.d# grep TOOLSTACK * > xend:TOOLSTACK=$(/usr/lib/xen-common/bin/xen-toolstack 2>/dev/null) > xend: if [ -z "$XEND" ] || [ "$(basename "$TOOLSTACK")" != xm ]; then >
Attached patch should fix the problem. Waldi, could you please apply it? This would also help the XCP stack in easy determination of which stack is in use. Otherwise, please let me know. I can also commit it. I have write access to pkg-xen. Rietsh -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System
--- xen-utils-common.xend.init 2012-02-01 23:10:58.000000000 +0530 +++ /etc/init.d/xend 2012-03-01 00:06:48.000000000 +0530 @@ -15,15 +15,22 @@ . /lib/init/vars.sh . /lib/lsb/init-functions +if [ -f /etc/default/xen ]; then + . /etc/default/xen +fi + ROOT=$(/usr/lib/xen-common/bin/xen-dir 2>/dev/null) if [ $? -ne 0 ]; then log_warning_msg "Not running within Xen or no compatible utils" exit 0 fi -TOOLSTACK=$(/usr/lib/xen-common/bin/xen-toolstack 2>/dev/null) -if [ $? -ne 0 ]; then - log_warning_msg "No usable Xen toolstack selected" - exit 0 + +if [ -z $TOOLSTACK ]; then + TOOLSTACK=$(/usr/lib/xen-common/bin/xen-toolstack 2>/dev/null) + if [ $? -ne 0 ]; then + log_warning_msg "No usable Xen toolstack selected" + exit 0 + fi fi [ -e "$ROOT"/bin/xend ] && XEND="$ROOT"/bin/xend
signature.asc
Description: OpenPGP digital signature
