X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai-revm;h=f7e45c9f97b960fa0af105fb9c4378f8c52c1f89;hp=3b057957ea9ae71a7465f6addc60f881ea8c4920;hb=836348b3deca3d4544bcf4ece81d8609740da550;hpb=da61a304a10de72288782a9d872769fe44576f50

diff --git a/fai-revm b/fai-revm
index 3b05795..f7e45c9 100755
--- a/fai-revm
+++ b/fai-revm
@@ -17,9 +17,9 @@
 
 
 
-x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
-
-script_dir="$(readlink -f "$BASH_SOURCE")"
+x="$(readlink -f "$BASH_SOURCE")"
+script_dir="${x%/*}"
+source "${script_dir}/bash-trace"
 
 e() { echo "$*"; "$@"; }
 
@@ -66,7 +66,6 @@ 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
-    mkdir -p /a/tmp
     cp -ar /a/bin/fai /tmp/faifreeze
     exec /tmp/faifreeze/${BASH_SOURCE##*/} "${orig_args[@]}"
 fi
@@ -84,12 +83,12 @@ cleanup() {
 _errcatch_cleanup=cleanup
 
 if is_arch_revm; then
-    ./pxe-server demohost arch
+    e ./pxe-server demohost arch
     sleep 2
     # via osinfo-query os. guessing arch is closest to latest fedora.
     variant=fedora22
 else
-    ./pxe-server demohost fai
+    e ./pxe-server 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.