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

diff --git a/fai-revm b/fai-revm
index 7645888..acf0db2 100755
--- a/fai-revm
+++ b/fai-revm
@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#!/bin/bash
 # Copyright (C) 2016 Ian Kelling
 
 # This program is free software; you can redistribute it and/or
@@ -22,6 +22,7 @@ script_dir="${this_file%/*}"
 # shellcheck source=./bash-trace
 source "${script_dir}/bash-trace"
 cd $script_dir
+PATH="$PATH:$PWD"
 
 e() { echo "$*"; "$@"; }
 
@@ -86,12 +87,11 @@ is_arch_revm() {
   [[ ${0##*/} == arch-revm ]]
 }
 
-cleanup() {
+err-cleanup() {
   echo "doing cleanup"
   e ./pxe-server $dhcp_arg
   ./faiserver-disable
 }
-_errcatch_cleanup=cleanup
 
 boot_arg=--pxe
 if is_arch_revm; then
@@ -110,9 +110,9 @@ 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 s fai-cd -g $(readlink -f grub.cfg.${iso%%.*}) -f -A $isopath
+      e sudo fai-cd -g $(readlink -f grub.cfg.${iso%%.*}) -f -A $isopath
     fi
     boot_arg="--cdrom $isopath"
     e fai-redep
@@ -127,7 +127,8 @@ fi
 
 name=demohost
 
-e s virshrm $name ||:
+e sudo virsh destroy $name ||:
+e sudo virsh undefine $name ||:
 
 
 disk_arg=()
@@ -135,8 +136,8 @@ for ((i=1; i <= disk_count; i++)); do
   f=/var/lib/libvirt/images/${name}$i
   disk_arg+=("--disk path=$f")
   if $new_disk || [[ ! -e $f ]]; then
-    s rm -f $f
-    e s qemu-img create -o preallocation=metadata -f qcow2 $f 50G
+    sudo rm -f $f
+    e sudo qemu-img create -o preallocation=metadata -f qcow2 $f 50G
   fi
 done
 
@@ -145,19 +146,19 @@ 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:
 # init_module+0x108/0x1000 [raid6_pq]
 #
 # uniq is to stop gtk-warning spam
-# e s virt-install --os-variant $variant  -n $name --pxe -r 2048 --vcpus 1 \
+# e sudo virt-install --os-variant $variant  -n $name --pxe -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 &
 
-
-e s virt-install --rng /dev/urandom --os-variant $variant  -n $name $boot_arg -r 2048 --vcpus 1 \
+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 _errcatch_cleanup
+unset -f err-cleanup
 e ./pxe-server $dhcp_arg
 if is_arch_revm; then
   ./arch-init-remote $name