X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-revm;h=a44b218c994df855a90377181a18544515a58a3a;hb=78a1427fc167ccee73d448054a9c40c19d737ed3;hp=79333773f6bf63a4d6437bc210e8b0e5123ebf6c;hpb=527f50b38e4a94a771215131cafe016a97ba83cd;p=automated-distro-installer

diff --git a/fai-revm b/fai-revm
index 7933377..a44b218 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
@@ -17,9 +17,12 @@
 
 
 
-x="$(readlink -f "$BASH_SOURCE")"
-script_dir="${x%/*}"
+readonly this_file="$(readlink -f -- "${BASH_SOURCE[0]}")"
+script_dir="${this_file%/*}"
+# shellcheck source=./bash-trace
 source "${script_dir}/bash-trace"
+cd $script_dir
+PATH="$PATH:$PWD"
 
 e() { echo "$*"; "$@"; }
 
@@ -37,6 +40,7 @@ fails. Just run again if that happens.
 -n         Create new qcow2(s) for vm. Good for testing partitioning
            script, to ensure a blank disk.
 -p         Use pxe instead of autodiscover iso with fai.
+-c         Use normal fai-cd iso is instead of autodiscover iso.
 -r         Do not boot after install is complete
 -h|--help  Print help and exit.
 
@@ -48,13 +52,15 @@ EOF
 orig_args=("$@")
 new_disk=false
 pxe=false
-temp=$(getopt -l help dnprh "$@") || usage 1
+iso=autodiscover.iso
+temp=$(getopt -l help dnpcrh "$@") || usage 1
 eval set -- "$temp"
 while true; do
   case $1 in
     -d) dhcp_arg=-d; shift ;;
     -n) new_disk=true; shift ;;
     -p) pxe=true; shift ;;
+    -c) iso=netinst.iso; shift ;;
     -r) reboot_arg=--noreboot; shift ;;
     -h|--help) usage ;;
     --) shift; break ;;
@@ -65,7 +71,7 @@ done
 
 # change this to test different disk counts. 1 and > 1 should be the only
 # important things to test.
-disk_count=1
+disk_count=2
 
 
 if [[ $script_dir == /a/bin/* ]]; then
@@ -76,18 +82,16 @@ if [[ $script_dir == /a/bin/* ]]; then
   exec /tmp/faifreeze/${BASH_SOURCE##*/} "${orig_args[@]}"
 fi
 
-cd $script_dir
 
 is_arch_revm() {
   [[ ${0##*/} == arch-revm ]]
 }
 
-cleanup() {
+errcatch-cleanup() {
   echo "doing cleanup"
   e ./pxe-server $dhcp_arg
   ./faiserver-disable
 }
-_errcatch_cleanup=cleanup
 
 boot_arg=--pxe
 if is_arch_revm; then
@@ -100,14 +104,17 @@ else
     e ./pxe-server $dhcp_arg demohost fai
     sleep 2
   else
-    fai-monitor&
-    if [[ $BASEFILE_DIR ]]; then
+    killall fai-monitor &>/dev/null ||:
+    fai-monitor &
+    if [[ ! $BASEFILE_DIR ]]; then
       BASEFILE_DIR=/tmp
     fi
-    if [[ ! -e $BASEFILE_DIR/autodiscover.iso ]]; then
-      fai-cd grub.cfg.autodiscover -f -A $BASEFILE_DIR/autodiscover.iso
+    isopath=$BASEFILE_DIR/$iso
+    isosrc=$BASEFILE_DIR/STRETCH64.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
-    boot_arg="--cdrom $BASEFILE_DIR/autodiscover.iso"
+    boot_arg="--cdrom $isopath"
     e fai-redep
     e myfai-chboot default
   fi
@@ -120,7 +127,7 @@ fi
 
 name=demohost
 
-e s virshrm $name ||:
+e sudo virshrm $name ||:
 
 
 disk_arg=()
@@ -128,8 +135,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,12 +152,12 @@ s iptables -P FORWARD ACCEPT
 # 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 --os-variant $variant  -n $name $boot_arg -r 2048 --vcpus 1 \
+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 &
 
@@ -163,7 +170,7 @@ sleep 30
 while ! timeout -s 9 10 ssh -oBatchMode=yes root@$name /bin/true; do
   e sleep 5
 done
-unset _errcatch_cleanup
+unset errcatch-cleanup
 e ./pxe-server $dhcp_arg
 if is_arch_revm; then
   ./arch-init-remote $name