- xen does not like : anymore

diff --git a/build b/build
index 8d54bf1..abad54e 100755 (executable)
--- a/build
+++ b/build
@@ -1010,8 +1010,8 @@ if test -n "$KILL" ; then
        XENID="${XENID%/tmpfs}"
        XENID="${XENID##*/}"
        XENID="${XENID#root_}"
-       if xm list "build:$XENID" >/dev/null 2>&1 ; then
-           if ! xm destroy "build:$XENID" ; then
+       if xm list "build_$XENID" >/dev/null 2>&1 ; then
+           if ! xm destroy "build_$XENID" ; then
                echo "could not kill xen build $XENID"
                cleanup_and_exit 1
            fi
@@ -1166,7 +1166,7 @@ if test -z "$RUNNING_IN_VM" ; then
            XENID="${XENID%/tmpfs}"
            XENID="${XENID##*/}"
            XENID="${XENID#root_}"
-           xm destroy "build:$XENID" >/dev/null 2>&1
+           xm destroy "build_$XENID" >/dev/null 2>&1
        fi
        if test ! -e "$VM_IMAGE"; then
            echo "Creating $VM_IMAGE (${VMDISK_ROOTSIZE}M)"
@@ -1462,7 +1462,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do
                XENID="${XENID#root_}"
 
                echo "booting XEN kernel ..."
-               if xm list "build:$XENID" >/dev/null 2>&1 ; then
+               if xm list "build_$XENID" >/dev/null 2>&1 ; then
                   echo "Instance already exist, something really went wrong..."
                   echo "Please report to your server admin, there might be multiple services running for same domain"
                   cleanup_and_exit 3
@@ -1477,7 +1477,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do
                echo "on_poweroff = 'destroy'"                                           >> $XEN_CONF_FILE
                echo "on_reboot = 'destroy'"                                             >> $XEN_CONF_FILE
                echo "on_crash = 'destroy'"                                              >> $XEN_CONF_FILE
-               set -- xm create -c $XEN_CONF_FILE name="build:$XENID" $XMROOT $XMSWAP extra="quiet init="$vm_init_script" elevator=noop panic=1 console=ttyS0"
+               set -- xm create -c $XEN_CONF_FILE name="build_$XENID" $XMROOT $XMSWAP extra="quiet init="$vm_init_script" elevator=noop panic=1 console=ttyS0"
                if test "$PERSONALITY" != 0 ; then
                    # have to switch back to PER_LINUX to make xm work
                    set -- linux64 "$@"
@@ -1556,7 +1556,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do
              BUILDSTATUS[02])
                mkdir -p $BUILD_ROOT/.build.packages
                cd $BUILD_ROOT/.build.packages || cleanup_and_exit 1
-               echo "build: extracting built packages..."
+               echo "build_ extracting built packages..."
                extractbuild --disk "$VM_IMAGE" --input "$VM_SWAP" --skip 512 -v || cleanup_and_exit 3
                # create same layout as with plain chroot
                if test "$BUILDTYPE" = spec ; then