optional --restarting after install

[code/vinst.git] / vinst

diff --git a/vinst b/vinst
index f323d56fcbd0e39d489272129c96123efa117e6c..dc0b82b969eacf1d543b3c204dae4ddd090633e0 100755 (executable)
--- a/vinst
+++ b/vinst
@@ -10,6 +10,8 @@ QEMU_URI=qemu:///system
 SUITE=wheezy
 CONSOLE='console=tty0 console=ttyS0,115200n8'
 DEBUG=0
 SUITE=wheezy
 CONSOLE='console=tty0 console=ttyS0,115200n8'
 DEBUG=0

+WIPE=0
+RESTART=0

 
 while [ -n "$1" ]; do
   case "$1" in
 
 while [ -n "$1" ]; do
   case "$1" in


@@ -78,6 +80,13 @@ while [ -n "$1" ]; do
       ;;
     (--debug)
       DEBUG=1
       ;;
     (--debug)
       DEBUG=1

+      set -vx
+      ;;
+    (--wipe)
+      WIPE=1
+      ;;
+    (--console)
+      RESTART=1

       ;;
   esac
   shift
       ;;
   esac
   shift


@@ -128,7 +137,9 @@ cat >&2 <<_eof
       arch: $ARCH
        ram: $RAM MiB
       disk: $DISK GiB
       arch: $ARCH
        ram: $RAM MiB
       disk: $DISK GiB

+      wipe: $WIPE

    console: $CONSOLE
    console: $CONSOLE

+   restart: $RESTART

 net bridge: $BRIDGE
 _eof
 if [ -n "$IPADDRESS" ]; then
 net bridge: $BRIDGE
 _eof
 if [ -n "$IPADDRESS" ]; then


@@ -146,10 +157,15 @@ fi
 
 echo >&2
 
 
 echo >&2
 

-set -v

 virsh --connect=$QEMU_URI vol-create-as $STORAGE_POOL virt-$HOSTNAME ${DISK}G
 virsh --connect=$QEMU_URI vol-create-as $STORAGE_POOL virt-$HOSTNAME ${DISK}G

+if [ $WIPE = 1 ]; then
+  virsh --connect=$QEMU_URI vol-wipe --pool $STORAGE_POOL --algorithm zero virt-$HOSTNAME
+fi

 
 

-[ $DEBUG = 1 ] && DEBUGFLAG=--debug
+if [ $DEBUG = 1 ]; then
+  DEBUGFLAG=--debug
+  extra_args="$extra_args DEBCONF_DEBUG=5"
+fi

 
 virt-install --connect=$QEMU_URI \
   ${DEBUGFLAG:-} \
 
 virt-install --connect=$QEMU_URI \
   ${DEBUGFLAG:-} \


@@ -169,4 +185,7 @@ virt-install --connect=$QEMU_URI \
   "$@"
 
 virsh --connect=$QEMU_URI console $HOSTNAME
   "$@"
 
 virsh --connect=$QEMU_URI console $HOSTNAME

-virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"
+
+if [ $RESTART = 1]; then
+  virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"
+fi