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
t12 related changes
[automated-distro-installer]
/
dsfull
diff --git
a/dsfull
b/dsfull
index cdb840b9272779b9abf378213ef5a5ea773b06dc..709ddab407f1163cff037c8efb647701e1d5142a 100755
(executable)
--- a/
dsfull
+++ b/
dsfull
@@
-70,7
+70,7
@@
if $kexec; then
myfai-chboot $host
live-kexec $host ||:
else
myfai-chboot $host
live-kexec $host ||:
else
- err
catch
-cleanup() { pxe-server; }
+ 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 err
catch
-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