Remove running OS in Docker and setup better qemu args

scripts/dockerimages/scripts/os-dockerfile

@@ -1,4 +0,0 @@
-FROM scratch
-COPY init busybox docker images.tar /
-COPY lib /lib
-CMD ["/init", "rancher.disable=[udev,network]"]

scripts/package

@@ -7,7 +7,6 @@ source scripts/build-common
 
 
 cp bin/rancheros ${BUILD}/initrd/init
-cp scripts/dockerimages/scripts/os-dockerfile ${BUILD}/initrd/Dockerfile
 
 cd ${BUILD}/initrd
 

scripts/run

@@ -47,10 +47,6 @@ fi
 cp bin/rancheros ${INITRD_TMP}/init
 cd ${INITRD_TMP}
 
-if [ "$1" == "--docker" ]; then
-    docker build -t rancheros-run .
-    docker run --rm --privileged -it rancheros-run
-else
 find | cpio -H newc -o > ${INITRD_TEST}
 
 if [ ! -e ${HD} ]; then
@@ -68,6 +64,19 @@ else
     fi
 done
 
+while [ "$#" -gt 0 ]; do
+    case $1 in
+        --append)
+            shift 1
+            QEMU_APPEND="${QEMU_APPEND} $1"
+            ;;
+        *)
+            break
+            ;;
+    esac
+    shift 1
+done
+
 qemu-system-x86_64 -serial stdio \
     -kernel ${KERNEL} \
     -initrd ${INITRD_TEST} \
@@ -80,6 +89,6 @@ else
     -smp 4 \
     -fsdev local,id=conf,security_model=none,readonly,path=$(pwd)/cloud-init \
     -device virtio-9p-pci,fsdev=conf,mount_tag=config-2 \
-        -append "x rancher.password=rancher $@" \
+    -append "rancher.password=rancher console=ttyS0 ${QEMU_APPEND}" \
-        ${QEMU_ARGS}
+    -serial mon:telnet:localhost:4444,server,nowait \
-fi
+    ${QEMU_ARGS} "${@}"