From: Ian Kelling <iank@fsf.org>
Date: Mon, 8 Apr 2019 23:54:08 +0000 (-0400)
Subject: minor bug fixes
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=ef0a70393a38632614fa6382f52546b1177b9f28;p=automated-distro-installer

minor bug fixes
---

diff --git a/faiserver-setup b/faiserver-setup
index 17dfba3..4742ae1 100755
--- 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 944620e..3abb1ba 100755
--- 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,