summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2014-04-01 17:39:48 +0200
committerFlorian Pritz <bluewind@xinu.at>2014-04-01 17:39:48 +0200
commit38cfb550be388aeb7a1630083ddaf5c13d858afd (patch)
tree703787ce4033f857004a015749238be03d918969
parent19be1e7bebbabc5f27b9258492f97f54a369c5b2 (diff)
downloadbin-38cfb550be388aeb7a1630083ddaf5c13d858afd.tar.gz
bin-38cfb550be388aeb7a1630083ddaf5c13d858afd.tar.xz
vm scripts: add viewer and check for network in install script
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--setup-arch-vm6
-rwxr-xr-xviewvm4
2 files changed, 9 insertions, 1 deletions
diff --git a/setup-arch-vm b/setup-arch-vm
index 60fe8f6..dcadc9a 100644
--- a/setup-arch-vm
+++ b/setup-arch-vm
@@ -5,6 +5,7 @@ set -e
newuser="flo"
disk=/dev/vda
server=192.168.123.1
+pingcheckhost="mirror.server-speed.net"
die() {
echo "$@"
@@ -32,7 +33,10 @@ cmdline_arg() {
grep -qE '^flags\s+: .* hypervisor( |$)' /proc/cpuinfo || die "Not running in hypervisor. aborting automatic setup"
-dhcpcd eth0
+# wait for host to be reachable (including dns query)
+while ! ping -c1 -W0.3 "$pingcheckhost" >/dev/null; do
+ sleep 0.2
+done
parted -s -- $disk mklabel msdos mkpart primary 1 -0
diff --git a/viewvm b/viewvm
new file mode 100755
index 0000000..538fe85
--- /dev/null
+++ b/viewvm
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+vncviewer $(virsh vncdisplay $1) &>/dev/null &
+disown