X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=dsfull;h=f1371d18ab07f59e43c2192cecec69b4fbef5a5f;hb=8bf6d9c4cc9ec88976c62af33f32c0c660e977e0;hp=51ecdda5013c6101e788d5f31383f4b900d4c691;hpb=d6df8985152a6c17523cedc3fee62694544eeaf2;p=automated-distro-installer

diff --git a/dsfull b/dsfull
index 51ecdda..f1371d1 100755
--- a/dsfull
+++ b/dsfull
@@ -1,14 +1,19 @@
 #!/bin/bash -l
 # Copyright (C) 2016 Ian Kelling
 
-# distro setup full using fai. (assuming we already synced data files to the host)
-# Usage: dsfull [-r] HOST
-# -r for no reboot.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 
+#     http://www.apache.org/licenses/LICENSE-2.0
 
-set -eE -o pipefail
-cleanup() { :; }
-trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
 
 reboot=true
 if [[ $1 == -r ]]; then
@@ -16,27 +21,67 @@ if [[ $1 == -r ]]; then
     shift
 fi
 
+usage() {
+    cat <<EOF
+Usage: ${0##*/} [OPTIONS] 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.
+
+-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
+EOF
+    exit $1
+}
+
+##### begin command line parsing ########
+
+reboot=true
+kexec=false
+temp=$(getopt -l help,no-r hk "$@") || usage 1
+eval set -- "$temp"
+while true; do
+    case $1 in
+        --no-r) reboot=false; shift ;;
+        -k) kexec=true; reboot=false; shift ;;
+        -h|--help) usage ;;
+        --) shift; break ;;
+        *) echo "$0: Internal error!" ; exit 1 ;;
+    esac
+done
 host=$1
 
-if [[ ! $host || $host == -h ]]; then
+##### end command line parsing ########
+
+ser stop btrbk.timer
+if [[ ! $host ]]; then
     echo "$0: error: expected 1 arg of hostname"
     exit 1
 fi
 
-set -x
-
-cleanup() { pxe-server :; }
-pxe-server $host fai
+if $kexec; then
+    fai-redep
+    myfai-chboot $host
+    live-kexec $host ||:
+else
+    cleanup() { pxe-server; }; _errcatch_cleanup=cleanup
+    pxe-server $host fai
 
+    if $reboot; then
+        # untested, this caused hang using here doc.
+        ssh root@$host "touch /tmp/keyscript-off; reboot" ||: &
+    fi
 
-if $reboot; then
-    # untested, this caused hang using here doc.
-    ssh $host "touch /tmp/keyscript-off; sudo reboot" ||: &
+    pxe-server -a
+    unset _errcatch_cleanup
 fi
 
-pxe-server -a
-cleanup() { :; }
-
 error=true
 for ((i=0; i<240; i++)); do
     if timeout -s 9 10 ssh $host :; then
@@ -45,8 +90,16 @@ for ((i=0; i<240; i++)); do
     fi
     sleep 5
 done
+faiserver-disable
 if $error; then
     echo "$0: error: timeout"
     exit 1
 fi
+while [[ $(ser is-active btrbk.service) == active ]]; do
+    sleep 5
+done
+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