X-Git-Url: https://git.madduck.net/code/vinst.git/blobdiff_plain/44c183155e8e208d4b381c63b92fcb910abc4c85..4a3a6109056c2257ea1202ef004eadcb22bd891c:/vinst diff --git a/vinst b/vinst index 2de250e..695ae17 100755 --- a/vinst +++ b/vinst @@ -18,6 +18,14 @@ while [ -n "$1" ]; do (--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 @@ -156,6 +164,7 @@ fi cat >&2 <<_eof hostname: $HOSTNAME arch: $ARCH + suite: $SUITE ram: $RAM MiB disk: $DISK GiB wipe: $WIPE @@ -199,12 +208,12 @@ 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 \ - --prompt --noautoconsole --autostart \ --extra-args="$extra_kargs" \ + --prompt --noautoconsole --autostart $extra_opts \ + -l $BASEDIR/installer-amd64/$SUITE \ "$@" virsh --connect=$QEMU_URI console $HOSTNAME