add rescue, fix default pxe, ubuntu locale

[automated-distro-installer] / myfai-chboot

diff --git a/myfai-chboot b/myfai-chboot
index 2a6e02590d2a7fc6e59ce50521db6ac44a1dcf91..452f8fa579cd3a45de80684a25db60d9b565fb52 100755 (executable)
--- a/myfai-chboot
+++ b/myfai-chboot
@@ -9,10 +9,23 @@ usage() {
     cat <<EOF
 usage: ${0##*/} [-h|--help] [hostname|ip]
 
-Sets up tftp pxe config and nfs config on host "faiserver". Argument
-sets the host to enable it for.  No argument disables pxe config for all
-hosts, but leaves nfs server alone. Use faiserver-disable to disable
-the nfs server.
+Sets up tftp pxe config and nfs server on host "faiserver".
+
+If our kernel has no nfs support, uses apache, and depends on another
+repo of Ian Kelling, basic-https-conf, where the file is at
+/a/exe/web-conf.
+
+Usng this, you can boot into fai with pxe-kexec without changing
+the dhcp server.
+
+Argument sets the host to enable it for.  No argument disables pxe
+config for all hosts, but leaves nfs server alone. Use faiserver-disable
+to disable the nfs server.
+
+-S          sets FAI_ACTION=sysinfo, and remove fai flag reboot.
+            Usefull for doing a system recovery.
+-h|--help   Print help and exit.
+
 EOF
     exit $1
 }
@@ -22,4 +35,4 @@ esac
 
 
 host=$(chost faiserver)
-ssh root@$host bash -s "$@" <myfai-chboot-local
+ssh root@$host bash -s -- "$@" <myfai-chboot-local