Make invirt-lvm lvcreate-all use sqlalchemy correctly.

[invirt/packages/invirt-remote.git] / host / usr / sbin / invirt-vmcontrol

diff --git a/host/usr/sbin/invirt-vmcontrol b/host/usr/sbin/invirt-vmcontrol
index 9080dfc..66f5ca6 100755 (executable)
--- a/host/usr/sbin/invirt-vmcontrol
+++ b/host/usr/sbin/invirt-vmcontrol
@@ -12,10 +12,6 @@ ORIGMACHINE="$1"
 ACTION="$2"
 MACHINE="d_$ORIGMACHINE"
 
 ACTION="$2"
 MACHINE="d_$ORIGMACHINE"
 

-xm () {
-    command xm "$@" || exit 35
-}
-

 case "$ACTION" in
     list|vcpu-list|uptime)
         xm "$ACTION" "$MACHINE"
 case "$ACTION" in
     list|vcpu-list|uptime)
         xm "$ACTION" "$MACHINE"

@@ -26,6 +22,9 @@ case "$ACTION" in
        ;;
     install|create)
        shift; shift;
        ;;
     install|create)
        shift; shift;

+       if [ -f "/etc/invirt/nocreate" ]; then
+               echo "Host $HOSTNAME is currently refusing VM creation." && exit 2
+       fi

        xm list "$MACHINE" >/dev/null 2>/dev/null && echo "$MACHINE already exists" && exit 1
        if [ "$ACTION" = "install" ]; then
            xm create invirt-database machine_name="$ORIGMACHINE" installer_options="$(printf '%q ' "$@")"
        xm list "$MACHINE" >/dev/null 2>/dev/null && echo "$MACHINE already exists" && exit 1
        if [ "$ACTION" = "install" ]; then
            xm create invirt-database machine_name="$ORIGMACHINE" installer_options="$(printf '%q ' "$@")"