Make the auto enable hypervisor_service optional

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

scripts/run

@@ -10,6 +10,9 @@ MEMORY=2048
 
 while [ "$#" -gt 0 ]; do
     case $1 in
+	--debug)
+	    DEBUG=1
+            ;;
         --iso)
             BOOT_ISO=1
             QEMU=0
@@ -160,6 +163,9 @@ if [ "$REBUILD" == "1" ] || [ ! -e ${INITRD} ]; then
 fi
 
 KERNEL_ARGS="${DEFAULT_KERNEL_ARGS} ${QEMU_APPEND}"
+if [ "$DEBUG" == "1" ]; then
+    KERNEL_ARGS="${KERNEL_ARGS} rancher.debug=true"
+fi
 if [ "$FORMAT" == "1" ]; then
     KERNEL_ARGS="${KERNEL_ARGS} rancher.state.dev=LABEL=RANCHER_STATE rancher.state.autoformat=[/dev/sda,/dev/vda]"
 fi

scripts/run-common

@@ -52,4 +52,4 @@ if [ "$ENGINE_REGISTRY_MIRROR" != "" ]; then
 	REGISTRY_MIRROR="rancher.bootstrap_docker.registry_mirror=${ENGINE_REGISTRY_MIRROR} rancher.system_docker.registry_mirror=${ENGINE_REGISTRY_MIRROR} rancher.docker.registry_mirror=${ENGINE_REGISTRY_MIRROR}"
 fi
 
-DEFAULT_KERNEL_ARGS="printk.devkmsg=on rancher.debug=true rancher.password=rancher console=tty1 rancher.autologin=tty1 console=${TTYCONS} rancher.autologin=${TTYCONS} ${REGISTRY_MIRROR} "
+DEFAULT_KERNEL_ARGS="printk.devkmsg=on rancher.password=rancher console=tty1 rancher.autologin=tty1 console=${TTYCONS} rancher.autologin=${TTYCONS} ${REGISTRY_MIRROR} "

scripts/schema.json

@@ -51,7 +51,8 @@
         "defaults": {"$ref": "#/definitions/defaults_config"},
         "resize_device": {"type": "string"},
         "sysctl": {"type": "object"},
-        "restart_services": {"type": "array"}
+        "restart_services": {"type": "array"},
+	"hypervisor_service": {"type": "boolean"}
       }
     },