X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=dsfull;h=91ab8ecfcb94b8427d62dc03f96e6fa767f46c79;hp=5cc0fad0a972de334be5db84f5866aba3d5b1a1a;hb=HEAD;hpb=9ac5bbeccb3e969e29b372656bd51352ff31b0b8

diff --git a/dsfull b/dsfull
index 5cc0fad..709ddab 100755
--- a/dsfull
+++ b/dsfull
@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#!/bin/bash
 # Copyright (C) 2016 Ian Kelling
 
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
+if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
 
 reboot=true
 if [[ $1 == -r ]]; then
@@ -68,9 +68,9 @@ fi
 if $kexec; then
     fai-redep
     myfai-chboot $host
-    fai-kexec $host ||:
+    live-kexec $host ||:
 else
-    cleanup() { pxe-server; }; _errcatch_cleanup=cleanup
+    err-cleanup() { pxe-server; }
     pxe-server $host fai
 
     if $reboot; then
@@ -79,7 +79,7 @@ else
     fi
 
     pxe-server -a
-    unset _errcatch_cleanup
+    unset err-cleanup
 fi
 
 error=true
@@ -98,8 +98,7 @@ fi
 while [[ $(ser is-active btrbk.service) == active ]]; do
     sleep 5
 done
+# if we partitioned, we do this:
+#btrbk-run -t $host archive
 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
 dsremote $host