add installer-i386 and enable --arch specification

[code/vinst.git] / vinst

diff --git a/vinst b/vinst
index 73d50c418d257c593495da5871bb9678375cc701..6ca0f76a096c516a7aa2a2e9f0daa56d4a3bff78 100755 (executable)
--- a/vinst
+++ b/vinst
@@ -67,6 +67,14 @@ while [ -n "$1" ]; do
       fi
       DISK="$1"
       ;;
       fi
       DISK="$1"
       ;;

+    (-a|--arch)
+      shift
+      if [ -z "$1" ]; then
+        echo >&2 'E: --arch/-a needs size argument'
+        exit 1
+      fi
+      ARCH="$1"
+      ;;

   esac
   shift
 done
   esac
   shift
 done


@@ -107,8 +115,13 @@ else
   BRIDGE=virt-br
 fi
 
   BRIDGE=virt-br
 fi
 

+if [ -z "$ARCH" ]; then
+  ARCH=$(dpkg --print-architecture)
+fi
+

 cat >&2 <<_eof
   hostname: $HOSTNAME
 cat >&2 <<_eof
   hostname: $HOSTNAME

+      arch: $ARCH

        ram: $RAM MiB
       disk: $DISK GiB
    console: $CONSOLE
        ram: $RAM MiB
       disk: $DISK GiB
    console: $CONSOLE


@@ -127,12 +140,15 @@ else
 _eof
 fi
 
 _eof
 fi
 

-exit 0
+echo >&2

 
 

-exec virt-install --connect=$QEMU_URI \
+set -v
+virsh --connect=$QEMU_URI vol-create-as $STORAGE_POOL virt-$HOSTNAME ${DISK}G
+
+virt-install --connect=$QEMU_URI \

   -n $HOSTNAME \
   -r $RAM \
   -n $HOSTNAME \
   -r $RAM \

-  --disk pool=default,size=$SIZE \
+  --disk vol=$STORAGE_POOL/virt-$HOSTNAME \

   -w bridge=$BRIDGE \
   --graphics=vnc \
   --serial=pty \
   -w bridge=$BRIDGE \
   --graphics=vnc \
   --serial=pty \


@@ -141,6 +157,9 @@ exec virt-install --connect=$QEMU_URI \
   -l $BASEDIR/installer-amd64 \
   --initrd-inject=$BASEDIR/preseed/$SUITE/preseed.cfg \
   --initrd-inject=$tmpdir/commands.tar \
   -l $BASEDIR/installer-amd64 \
   --initrd-inject=$BASEDIR/preseed/$SUITE/preseed.cfg \
   --initrd-inject=$tmpdir/commands.tar \

+  --prompt --noautoconsole --autostart \

   --extra-args="$extra_args" \
   --extra-args="$extra_args" \

-  --autostart \

   "$@"
   "$@"

+
+virsh --connect=$QEMU_URI console $HOSTNAME
+virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"