X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=dsfull;h=df9c398f2936f8b8f27c6708016982ff13428030;hb=bacafbabe07c9edc86eaa75c24887d6fac0c310a;hp=06af7f8f68e2ac0cd0f5fb768e83fcaf93dde284;hpb=7f77555b3d92709034fe41919358053c650c71e1;p=automated-distro-installer

diff --git a/dsfull b/dsfull
index 06af7f8..df9c398 100755
--- a/dsfull
+++ b/dsfull
@@ -13,9 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -eE -o pipefail
-cleanup() { :; }
-trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
 
 reboot=true
 if [[ $1 == -r ]]; then
@@ -26,10 +24,15 @@ fi
 usage() {
     cat <<EOF
 Usage: ${0##*/} [OPTIONS] HOST
-distro setup full using fai. (assuming we already synced data files to the host)
+"distro setup full" using fai.
+
+Note: relies on other repos and paths specific to Ian's system.
+Note: disables btrbk.timer. If it was active before, it should
+be manual reenabled after completion.
 
---no-r     Don't ssh to host and reboot.
 -k         ssh to host and kexec, don't use pxe. implies --no-r
+--no-r     Don't ssh to host and reboot. Use this for when you are
+           booting or rebooting from some other means.
 -h|--help  Print help and exit.
 
 Note: Uses GNU getopt options parsing style
@@ -56,7 +59,7 @@ host=$1
 
 ##### end command line parsing ########
 
-
+e ser stop btrbk.timer
 if [[ ! $host ]]; then
     echo "$0: error: expected 1 arg of hostname"
     exit 1
@@ -68,7 +71,7 @@ if $kexec; then
     e myfai-chboot $host
     e fai-kexec $host ||:
 else
-    cleanup() { pxe-server; }
+    cleanup() { pxe-server; }; _errcatch_cleanup=cleanup
     e pxe-server $host fai
 
     if $reboot; then
@@ -77,7 +80,7 @@ else
     fi
 
     e pxe-server -a
-    cleanup() { :; }
+    unset _errcatch_cleanup
 fi
 
 error=true
@@ -88,8 +91,16 @@ for ((i=0; i<240; i++)); do
     fi
     sleep 5
 done
+e faiserver-disable
 if $error; then
     echo "$0: error: timeout"
     exit 1
 fi
-e dsremote $host
+while [[ $(ser is-active btrbk.service) == active ]]; do
+    sleep 5
+done
+e 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