remove option to never upgrade ucf files

[automated-distro-installer] / fai-revm

diff --git a/fai-revm b/fai-revm
index 68840bd9d962c1c3cac9570464796f8a4f64dc3a..bd9a9d633b70ff1ed650a4e00a986b7705e1282c 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -17,10 +17,9 @@
 
 
 
 
 
 

-cleanup() { :; }
-set -eE -o pipefail
-trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
-script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
+x="$(readlink -f "$BASH_SOURCE")"
+script_dir="${x%/*}"
+source "${script_dir}/bash-trace"

 
 e() { echo "$*"; "$@"; }
 
 
 e() { echo "$*"; "$@"; }
 


@@ -34,6 +33,7 @@ then start a virtual machine to test the config
 Note, sometimes shutting down the existing demohost vm
 fails. Just run again if that happens.
 
 Note, sometimes shutting down the existing demohost vm
 fails. Just run again if that happens.
 

+-d         Don't do dhcp setup for when we aren't on Ian's home network.

 -r         Do not boot after install is complete
 -n         Create new qcow2(s) for vm. Good for testing partitioning
            script, to ensure a blank disk.
 -r         Do not boot after install is complete
 -n         Create new qcow2(s) for vm. Good for testing partitioning
            script, to ensure a blank disk.


@@ -44,11 +44,13 @@ EOF
     exit $1
 }
 
     exit $1
 }
 

+orig_args=("$@")

 new_disk=false
 new_disk=false

-temp=$(getopt -l help hnr "$@") || usage 1
+temp=$(getopt -l help dnrh "$@") || usage 1

 eval set -- "$temp"
 while true; do
     case $1 in
 eval set -- "$temp"
 while true; do
     case $1 in

+        -d) dhcp_arg=-d; shift ;;

         -n) new_disk=true; shift ;;
         -r) reboot_arg=--noreboot; shift ;;
         -h|--help) usage ;;
         -n) new_disk=true; shift ;;
         -r) reboot_arg=--noreboot; shift ;;
         -h|--help) usage ;;


@@ -67,9 +69,8 @@ if [[ $script_dir == /a/bin/* ]]; then
     # Copy our script elsewhere so we can develop it
     # and save it at the same time it's running
     rm -rf /tmp/faifreeze
     # Copy our script elsewhere so we can develop it
     # and save it at the same time it's running
     rm -rf /tmp/faifreeze

-    mkdir -p /a/tmp

     cp -ar /a/bin/fai /tmp/faifreeze
     cp -ar /a/bin/fai /tmp/faifreeze

-    exec /tmp/faifreeze/${BASH_SOURCE##*/} "$@"
+    exec /tmp/faifreeze/${BASH_SOURCE##*/} "${orig_args[@]}"

 fi
 
 cd $script_dir
 fi
 
 cd $script_dir


@@ -79,16 +80,19 @@ is_arch_revm() {
 }
 
 cleanup() {
 }
 
 cleanup() {

-    ./pxe-server
+    echo "doing cleanup"
+    e ./pxe-server $dhcp_arg

     ./faiserver-disable
 }
     ./faiserver-disable
 }

+_errcatch_cleanup=cleanup
+

 if is_arch_revm; then
 if is_arch_revm; then

-    ./pxe-server demohost arch
+    e ./pxe-server $dhcp_arg demohost arch

     sleep 2
     # via osinfo-query os. guessing arch is closest to latest fedora.
     variant=fedora22
 else
     sleep 2
     # via osinfo-query os. guessing arch is closest to latest fedora.
     variant=fedora22
 else

-    ./pxe-server demohost fai
+    e ./pxe-server $dhcp_arg demohost fai

     sleep 2
     # I don't think these variants actually make a diff for us, but I
     # use the appropriate one when trying a new distro just in case.
     sleep 2
     # I don't think these variants actually make a diff for us, but I
     # use the appropriate one when trying a new distro just in case.


@@ -108,7 +112,7 @@ for ((i=1; i <= disk_count; i++)); do
     disk_arg+=("--disk path=$f")
     if $new_disk || [[ ! -e $f ]]; then
         s rm -f $f
     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 20G
+        e s qemu-img create -o preallocation=metadata -f qcow2 $f 50G

     fi
 done
 
     fi
 done
 


@@ -116,6 +120,9 @@ if [[ $SSH_CLIENT ]]; then
     console_arg=--noautoconsole
 fi
 
     console_arg=--noautoconsole
 fi
 

+# docker makes forward default to drop, which blocks the vm pxe on flidas. easiest solution:
+s 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]
 # --cpu host: this causes mkfs.btrfs to fail with a stack trace which began
 # something like:
 # init_module+0x108/0x1000 [raid6_pq]


@@ -133,7 +140,7 @@ sleep 30
 while ! timeout -s 9 10 ssh -oBatchMode=yes root@$name /bin/true; do
     e sleep 5
 done
 while ! timeout -s 9 10 ssh -oBatchMode=yes root@$name /bin/true; do
     e sleep 5
 done

-cleanup() { :; }
+unset _errcatch_cleanup

 e pxe-server
 if is_arch_revm; then
     ./arch-init-remote $name
 e pxe-server
 if is_arch_revm; then
     ./arch-init-remote $name