X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=dsfull;h=f1371d18ab07f59e43c2192cecec69b4fbef5a5f;hb=f8d9b111d5e4f70ded03eb083eb17a0411e19c44;hp=df9c398f2936f8b8f27c6708016982ff13428030;hpb=a2b8051e808621b9a33617d0c75d212bd2141ddc;p=automated-distro-installer

diff --git a/dsfull b/dsfull
index df9c398..f1371d1 100755
--- a/dsfull
+++ b/dsfull
@@ -59,27 +59,26 @@ host=$1
 
 ##### end command line parsing ########
 
-e ser stop btrbk.timer
+ser stop btrbk.timer
 if [[ ! $host ]]; then
     echo "$0: error: expected 1 arg of hostname"
     exit 1
 fi
 
-e() { echo "$@"; "$@"; }
 if $kexec; then
-    e fai-redep
-    e myfai-chboot $host
-    e fai-kexec $host ||:
+    fai-redep
+    myfai-chboot $host
+    live-kexec $host ||:
 else
     cleanup() { pxe-server; }; _errcatch_cleanup=cleanup
-    e pxe-server $host fai
+    pxe-server $host fai
 
     if $reboot; then
         # untested, this caused hang using here doc.
-        ssh $host "touch /tmp/keyscript-off; sudo reboot" ||: &
+        ssh root@$host "touch /tmp/keyscript-off; reboot" ||: &
     fi
 
-    e pxe-server -a
+    pxe-server -a
     unset _errcatch_cleanup
 fi
 
@@ -91,7 +90,7 @@ for ((i=0; i<240; i++)); do
     fi
     sleep 5
 done
-e faiserver-disable
+faiserver-disable
 if $error; then
     echo "$0: error: timeout"
     exit 1
@@ -99,8 +98,8 @@ fi
 while [[ $(ser is-active btrbk.service) == active ]]; do
     sleep 5
 done
-e btrbk-run -t $host
-ssh $host /a/bin/distro-setup/distro-begin
+btrbk-run -t $host
+#ssh $host /a/bin/distro-setup/distro-begin
 # this should be done instead of distro-begin, but
 # keeping it to 2 steps for now
-#e dsremote $host
+dsremote $host