X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fdistro-install-common%2Fend;h=a7745b7bbf44241512822648706470b00fe0d0e5;hb=ac4e0089e245c96a388b8fcdd92fc05da3399694;hp=f230d3c4e662df3f88dd6390e1c6a2db46a78b0f;hpb=17ef86e0555e0c8db46708b9833da4f4591e74be;p=automated-distro-installer

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index f230d3c..a7745b7 100755
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -17,13 +17,14 @@ if [[ -e $src && -e $dst ]]; then
     cp -rT $src $dst
 fi
 
-if ifclass VOL_STABLE_BOOTSTRAP; then
+if ifclass VOL_STRETCH_BOOTSTRAP; then
     exit 0
 fi
 
 TPW=/q/root/shadow/traci-simple
 if ifclass tp; then
-    ROOTPW="$TPW"
+    ROOTPW=/q/root/shadow/standard
+#    ROOTPW="$TPW"
 else
     ROOTPW=/q/root/shadow/standard
 fi
@@ -43,26 +44,26 @@ chpw() {
         echo "$0: warning: no pw set for $user" >&2
     fi
 }
-au() { # add user
+au() { # add user. i don't use adduser for portability
     if ! $ROOTCMD getent passwd ${@: -1}; then
-        $ROOTCMD useradd -m -s /bin/bash $@
+        $ROOTCMD useradd -Um -s /bin/bash $@
     fi
 }
 
 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 +77,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 +97,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