iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more complete copyright notices
[automated-distro-installer]
/
dsfull
diff --git
a/dsfull
b/dsfull
index f1371d18ab07f59e43c2192cecec69b4fbef5a5f..709ddab407f1163cff037c8efb647701e1d5142a 100755
(executable)
--- 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");
# 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.
# 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
reboot=true
if [[ $1 == -r ]]; then
@@
-70,7
+70,7
@@
if $kexec; then
myfai-chboot $host
live-kexec $host ||:
else
myfai-chboot $host
live-kexec $host ||:
else
- cleanup() { pxe-server; }; _errcatch_cleanup=cleanup
+ err-cleanup() { pxe-server; }
pxe-server $host fai
if $reboot; then
pxe-server $host fai
if $reboot; then
@@
-79,7
+79,7
@@
else
fi
pxe-server -a
fi
pxe-server -a
- unset
_errcatch_
cleanup
+ unset
err-
cleanup
fi
error=true
fi
error=true
@@
-98,8
+98,7
@@
fi
while [[ $(ser is-active btrbk.service) == active ]]; do
sleep 5
done
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
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
dsremote $host