add rescue, fix default pxe, ubuntu locale

[automated-distro-installer] / faiserver-setup

diff --git a/faiserver-setup b/faiserver-setup
index f1ab4bad195b033a2ba084916208dbd57b7300df..f60ec4791a5c58d0fda16878136cfc8db7e8ac1b 100755 (executable)
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -154,6 +154,8 @@ s,^( *FAI_DEBOOTSTRAP=).*,\1"$base $r",
 # disabled for now, since creating fai nfsroot on my arm machine
 # is not working
 #/--arch amd64/!s/^(\s*FAI_DEBOOTSTRAP_OPTS=")/\1--arch amd64 /
+/^\s*FAI_ROOTPW/d
+$ a FAI_ROOTPW="$(</q/root/shadow/standard)"
 EOF
 
 $sed 's/#LOGUSER/LOGUSER/' /etc/fai/fai.conf