]> git.madduck.net Git - code/vinst.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Fix invocation and auto-console connection
authormartin f. krafft <madduck@madduck.net>
Wed, 26 Feb 2014 13:23:52 +0000 (14:23 +0100)
committermartin f. krafft <madduck@madduck.net>
Wed, 26 Feb 2014 13:23:52 +0000 (14:23 +0100)
vinst

diff --git a/vinst b/vinst
index e931fc396b2fca04fe08c123a1760adca9269128..51a87e9d667ae65e920ce8f496b58afc82e023ee 100755 (executable)
--- a/vinst
+++ b/vinst
@@ -127,9 +127,11 @@ else
 _eof
 fi
 
-exit 0
 
-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 \
   --disk vol=$STORAGE_POOL/virt-$HOSTNAME \
@@ -141,6 +143,9 @@ exec virt-install --connect=$QEMU_URI \
   -l $BASEDIR/installer-amd64 \
   --initrd-inject=$BASEDIR/preseed/$SUITE/preseed.cfg \
   --initrd-inject=$tmpdir/commands.tar \
+  --prompt --noautoconsole --autostart \
   --extra-args="$extra_args" \
-  --autostart \
   "$@"
+
+virsh --connect=$QEMU_URI console $HOSTNAME
+virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"