various fixes, improve flidas

[automated-distro-installer] / fai / config / distro-install-common / end

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index f230d3c4e662df3f88dd6390e1c6a2db46a78b0f..d10b9497d11d3ac2b4f07098e780b0567e7c30ae 100755 (executable)
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -51,18 +51,18 @@ au() { # add user
 
 chpw root "$ROOTPW"
 # 9 = user already exists. so we are idempotent.
-au ian
-chpw ian "$ROOTPW"
+au iank
+chpw iank "$ROOTPW"
 
 au traci
 if ifclass frodo; then
     chpw traci "$TPW"
 fi
-# comparing ian's groups to traci, I see none she should join on arch
-$ROOTCMD usermod -a -G traci ian
+# comparing iank's groups to traci, I see none she should join on arch
+$ROOTCMD usermod -a -G traci iank
 
 $ROOTCMD getent group docker &>/dev/null || $ROOTCMD groupadd -r docker
-$ROOTCMD usermod -a -G docker ian
+$ROOTCMD usermod -a -G docker iank
 
 # based on unison error, with 8192 from
 # sysctl -a | grep fs.inotify.max_user_watches
@@ -76,7 +76,7 @@ echo "fs.inotify.max_user_watches = 1000000" >> $f
 $ROOTCMD sysctl --system
 
 f=$target/etc/sudoers
-line='ian  ALL=(ALL)  NOPASSWD: ALL'
+line='iank  ALL=(ALL)  NOPASSWD: ALL'
 if [[ ! -e $f ]] || ! grep -xF "$line" $f; then
     echo "$line" >> $f
 fi
@@ -96,4 +96,4 @@ while true; do
     if [[ $dir == /p ]]; then break; fi
 done
 
-au -s /bin/false --home-dir /var/lib/bitcoind bitcoin
+au --system -s /bin/false --home-dir /var/lib/bitcoind bitcoin