X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai-revm;h=acf0db27fc0ae019e02b49d71063eadc0b4eaba8;hp=9fa0787ae335624adc238a4df2f4d726193a4506;hb=45a2a286083772abc0688e663a6ecc68af0a8d0e;hpb=cf3b64c21818d0033ffe5447d30e45141c81ee1b

diff --git a/fai-revm b/fai-revm
index 9fa0787..acf0db2 100755
--- a/fai-revm
+++ b/fai-revm
@@ -110,7 +110,7 @@ else
       BASEFILE_DIR=/tmp
     fi
     isopath=$BASEFILE_DIR/$iso
-    isosrc=$BASEFILE_DIR/STRETCH64.tar.gz
+    isosrc=$BASEFILE_DIR/BUSTER64.tar.gz
     if [[ ! -e $isopath || $(stat -c %Y $isopath) -lt $(stat -c %Y $isosrc) ]]; then
       e sudo fai-cd -g $(readlink -f grub.cfg.${iso%%.*}) -f -A $isopath
     fi
@@ -127,7 +127,8 @@ fi
 
 name=demohost
 
-e sudo virshrm $name ||:
+e sudo virsh destroy $name ||:
+e sudo virsh undefine $name ||:
 
 
 disk_arg=()
@@ -145,7 +146,7 @@ if [[ $SSH_CLIENT ]]; then
 fi
 
 # docker makes forward default to drop, which blocks the vm pxe on flidas. easiest solution:
-s iptables -P FORWARD ACCEPT
+e sudo iptables -P FORWARD ACCEPT
 
 # --cpu host: this causes mkfs.btrfs to fail with a stack trace which began
 # something like:
@@ -156,7 +157,7 @@ s iptables -P FORWARD ACCEPT
   #   ${disk_arg[*]} -w bridge=br0,mac=52:54:00:9c:ef:ad $reboot_arg \
   #   --graphics spice,listen=0.0.0.0 $console_arg |& grep -v '^ *$' | uniq &
 
-
+e sudo systemctl start libvirtd
 e sudo virt-install --rng /dev/urandom --os-variant $variant  -n $name $boot_arg -r 2048 --vcpus 1 \
   ${disk_arg[*]} -w bridge=br0,mac=52:54:00:9c:ef:ad $reboot_arg \
   --graphics spice,listen=0.0.0.0 $console_arg |& grep -v '^ *$' | uniq &
@@ -166,11 +167,11 @@ if [[ $SSH_CLIENT ]]; then
   fg
 fi
 
-sleep 30
+sleep 90
 while ! timeout -s 9 10 ssh -oBatchMode=yes root@$name /bin/true; do
   e sleep 5
 done
-unset err-cleanup
+unset -f err-cleanup
 e ./pxe-server $dhcp_arg
 if is_arch_revm; then
   ./arch-init-remote $name