integrate /usr with /

[code/vinst.git] / vinst

diff --git a/vinst b/vinst
index bf0a14d99a0ac1f22282dba22008a6fbbb178b40..695ae17f07af6ab7d07f5b5bfbf814b143a0fe5d 100755 (executable)
--- a/vinst
+++ b/vinst
@@ -15,6 +15,17 @@ RESTART=0
 
 while [ -n "$1" ]; do
   case "$1" in
+    (--debug)
+      DEBUG=1
+      ;;
+    (-S|--suite)
+      shift
+      if [ -z "$1" ]; then
+        echo >&2 'E: --suite/-S needs suite argument'
+        exit 1
+      fi
+      SUITE="$1"
+      ;;
     (-n|--name)
       shift
       if [ -z "$1" ]; then
@@ -93,7 +104,7 @@ while [ -n "$1" ]; do
     (--wipe)
       WIPE=1
       ;;
-    (--console)
+    (--restart)
       RESTART=1
       ;;
   esac
@@ -110,10 +121,15 @@ BASEDIR=$(cd ${0%/*}; pwd)
 tmpdir=$(mktemp -d)
 tar -C $BASEDIR/preseed/$SUITE -cf $tmpdir/commands.tar commands
 
-extra_args="auto $CONSOLE \
+extra_kargs="auto $CONSOLE \
 hostname=${HOSTNAME%%.*} \
 domain=${HOSTNAME#*.}"
 
+extra_opts=
+if [ -n "$DEBUG" ]; then
+  extra_opts='--debug'
+fi
+
 if [ -n "$IPADDRESS" ]; then
   if [ -z "$GATEWAY" ] && [ -x $(command -v ipcalc) ]; then
     # default to the first IP in the network
@@ -123,7 +139,7 @@ if [ -n "$IPADDRESS" ]; then
   IPADDRESS="${IPADDRESS%/*}"
   : ${NAMESERVER:=$GATEWAY}
 
-  extra_args="$extra_args netcfg/disable_dhcp=true \
+  extra_kargs="$extra_kargs netcfg/disable_dhcp=true \
   netcfg/get_ipaddress=$IPADDRESS \
   netcfg/get_netmask=$NETMASK \
   netcfg/get_gateway=$GATEWAY \
@@ -132,7 +148,7 @@ if [ -n "$IPADDRESS" ]; then
   BRIDGE=wan
 
 else
-  extra_args="$extra_args netcfg/disable_dhcp=false"
+  extra_kargs="$extra_kargs netcfg/disable_dhcp=false"
   BRIDGE=virt-br
 fi
 
@@ -148,6 +164,7 @@ fi
 cat >&2 <<_eof
   hostname: $HOSTNAME
       arch: $ARCH
+     suite: $SUITE
        ram: $RAM MiB
       disk: $DISK GiB
       wipe: $WIPE
@@ -173,6 +190,7 @@ echo >&2
 
 virsh --connect=$QEMU_URI vol-create-as $STORAGE_POOL virt-$HOSTNAME ${DISK}G
 if [ $WIPE = 1 ]; then
+  echo >&2 "Wiping disk…"
   virsh --connect=$QEMU_URI vol-wipe --pool $STORAGE_POOL --algorithm zero virt-$HOSTNAME
 fi
 
@@ -190,16 +208,16 @@ virt-install --connect=$QEMU_URI \
   --graphics=vnc \
   --serial=pty \
   --watchdog i6300esb,action=reset \
-  --os-variant=debian$SUITE \
-  -l $BASEDIR/installer-amd64 \
+  --os-variant=debianwheezy \
   --initrd-inject=$BASEDIR/preseed/$SUITE/preseed.cfg \
   --initrd-inject=$tmpdir/commands.tar \
-  --noautoconsole --autostart \
-  --extra-args="$extra_args" \
+  --extra-args="$extra_kargs" \
+  --prompt --noautoconsole --autostart $extra_opts \
+  -l $BASEDIR/installer-amd64/$SUITE \
   "$@"
 
 virsh --connect=$QEMU_URI console $HOSTNAME
 
-if [ $RESTART = 1]; then
+if [ $RESTART = 1 ]; then
   virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"
 fi