X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fdistro-install-common%2Fend;h=0642cf3be216ca9427cdc4c6a178bc76e0ce0d71;hb=bacafbabe07c9edc86eaa75c24887d6fac0c310a;hp=90082de579047090c387b05f944cb5f710e9cb80;hpb=875cea0c266c7802b336f5a8b61b63e109e670fb;p=automated-distro-installer

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index 90082de..0642cf3 100755
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -17,7 +17,7 @@ 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
 
@@ -51,16 +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 iank
 
 # based on unison error, with 8192 from
 # sysctl -a | grep fs.inotify.max_user_watches
@@ -74,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
@@ -94,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