add rescue, fix default pxe, ubuntu locale

[automated-distro-installer] / dsfull

diff --git a/dsfull b/dsfull
index 54ee3661a8a5d3c5569c6d89ed1cc55d1f5c7e7e..417635014c3d8413649d7c03bb9c2ac9b92e7163 100755 (executable)
--- a/dsfull
+++ b/dsfull
@@ -32,8 +32,9 @@ 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
@@ -92,6 +93,7 @@ for ((i=0; i<240; i++)); do
     fi
     sleep 5
 done
+e faiserver-disable
 if $error; then
     echo "$0: error: timeout"
     exit 1
@@ -100,4 +102,5 @@ while [[ $(ser is-active btrbk.service) == active ]]; do
     sleep 5
 done
 e btrbk-run -t $host
-e dsremote $host
+ssh $host /a/bin/distro-setup/distro-begin
+#e dsremote $host