add rescue, fix default pxe, ubuntu locale

[automated-distro-installer] / pxe-server

diff --git a/pxe-server b/pxe-server
index bba53e6cbfbc462d7b824ef2454f413ad330bcef..ec4606012a9703d1f70e2088f051057cbd2e1c44 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -45,7 +45,7 @@ TYPE       One of arch, plain, fai.
            for os boot. Sometimes on debian, there is a 3rd one shortly
            after the 2nd. I can't remember exactly why this caused a
            problem, but I'm hoping the sleep will take care of it.
-
+-S         Pass -S to fai-chboot.
 -w         Setup pxe, then wait like -a.
 -h|--help  Print help and exit
 
@@ -68,12 +68,13 @@ EOF
 redep=true
 acks=2
 wait=false
-temp=$(getopt -l help harw "$@") || usage 1
+temp=$(getopt -l help harSw "$@") || usage 1
 eval set -- "$temp"
 while true; do
     case $1 in
         -a) wait=true; set=false; shift ;;
         -r) redep=false; shift ;;
+        -S) chboot_arg=-S; shift ;;
         -w) wait=true; set=true; shift ;;
         -h|--help) usage ;;
         --) shift; break ;;
@@ -92,7 +93,7 @@ case $# in
         ;;
 esac
 
-if [[ $host ]]; then
+if [[ $host && $host != default ]]; then
     host_tag="tag:$host,"
 fi
 
@@ -150,7 +151,7 @@ $([[ $type == arch ]] && echo arch-pxe-mount)"
 if $set; then
     set-pxe
     if [[ $type == fai ]]; then
-        e myfai-chboot $host
+        e myfai-chboot $chboot_arg $host
         if $redep; then
             e fai-redep
         fi