minor bug fixes

diff --git a/faiserver-setup b/faiserver-setup
index 17dfba3db75bfe8d3799620a3ebf23a4703733ff..4742ae1d1ed1948f8a5d183d65a17430e05e5afc 100755 (executable)
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -181,8 +181,10 @@ s,^( *FAI_DEBOOTSTRAP=).*,\1"$base $r",
 EOF
 
 $sed 's/#LOGUSER/LOGUSER/' /etc/fai/fai.conf
+$sed -i '/^LOGUSER=/d' /etc/fai/fai.conf
 $sed -i '/^FAI_FLAGS=/d' /etc/fai/fai.conf
 echo "FAI_FLAGS=verbose" >>/etc/fai/fai.conf
+echo "LOGUSER=fai" >>/etc/fai/fai.conf
 
 # from man fai-make-nfsroot,
 # figured out after partitioning ignored my crypt partition

diff --git a/pxe-server b/pxe-server
index 944620ecc6647a2b20295b3d28c6576c1deafc9a..3abb1bac0876916751ef25604c2205a25bb47602 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -191,6 +191,7 @@ if $wait; then
   echo "waiting for $acks dhcp acks then disabling pxe"
   ack-wait $acks
   type=
+  unset cmd
   set-pxe
 
   # previously tried waiting for one more ack then disabling faiserver,