X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=dsfull;h=593e7d6e72ae3903ef3fee9773a51fbb551c853d;hb=0c400e34881621fa39a4d0bbf4403209e81efcfa;hp=f1371d18ab07f59e43c2192cecec69b4fbef5a5f;hpb=ed3681256885d295f39d5df60784d3281a2f8719;p=automated-distro-installer

diff --git a/dsfull b/dsfull
index f1371d1..593e7d6 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
@@ -70,7 +70,7 @@ if $kexec; then
     myfai-chboot $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,7 +98,8 @@ fi
 while [[ $(ser is-active btrbk.service) == active ]]; do
     sleep 5
 done
-btrbk-run -t $host
+bbk -t $host archive
+bbk -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