various fixes and improvements

[automated-distro-installer] / myfai-chboot

diff --git a/myfai-chboot b/myfai-chboot
index f732642dffa0811756e4df8bb79f0ede01ea9d3c..d0c0a97323d89d02d9b7da9748f5b1d4ad0235c2 100755 (executable)
--- a/myfai-chboot
+++ b/myfai-chboot
@@ -11,9 +11,9 @@ usage: ${0##*/} [-h|--help] [hostname|ip]
 
 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/apache-site.
+If our kernel has no nfs support, uses apache intead of nfs, 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.
@@ -22,6 +22,10 @@ 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
 }
@@ -31,4 +35,4 @@ esac
 
 
 host=$(chost faiserver)
-ssh root@$host bash -s "$@" <myfai-chboot-local
+ssh root@$host bash -s -- "$@" <myfai-chboot-local