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

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index b552952..a7745b7 100755
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -8,16 +8,23 @@ if [[ $EUID != 0 ]]; then
     exit 1
 fi
 
-### begin set hostname
-echo $hostname > /etc/hostname
-sed -i '/^127\.0\.1\.1/d' /etc/hosts
-echo "127.0.1.1 $hostname" >> /etc/hosts
-hostname -F /etc/hostname
-### end set hostname
+# ssh host keys
+# note, $BASH_SOURCE is not defined here under fai.
+src=$(dirname "$0")/p/c/machine_specific/$HOSTNAME/filesystem/etc/ssh
+dst=$target/etc/ssh
+if [[ -e $src && -e $dst ]]; then
+    # outside of fai context, we skip this
+    cp -rT $src $dst
+fi
+
+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
@@ -33,31 +40,30 @@ chpw() {
     pwfile=$2
     if [[ $pwfile && -e $pwfile ]]; then
         printf "$user:" | cat - "$pwfile" | $ROOTCMD chpasswd -e
-        else
-            echo "$0: warning: no pw set for $user"
+    else
+        echo "$0: warning: no pw set for $user" >&2
     fi
 }
-au() {
-    if ! $ROOTCMD getent passwd $1; then
-        $ROOTCMD useradd -m $1 -s /bin/bash || [[ $? == 9 ]]
+au() { # add user. i don't use adduser for portability
+    if ! $ROOTCMD getent passwd ${@: -1}; then
+        $ROOTCMD useradd -Um -s /bin/bash $@
     fi
 }
 
-echo "IANNNNNNN 222222222, $ROOTPW"
-ls -la $ROOTPW
-
 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
@@ -65,29 +71,30 @@ $ROOTCMD usermod -a -G traci ian
 
 f=$target/etc/sysctl.d/99-sysctl.conf
 key=fs.inotify.max_user_watches
-if [[ -e $f ]]; then sed -ri "/^\s*$key\s*=/d" $f; fi
+if [[ -e $f ]]; then sed -ri --follow-symlinks "/^\s*$key\s*=/d" $f; fi
 echo "fs.inotify.max_user_watches = 1000000" >> $f
 # applies it. it would be also be applied after a reboot
 $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
 
-
-dir=/q/p/c/machine_specific/$HOSTNAME/.unison
+dir=/p/c/machine_specific/$HOSTNAME/.unison
 $ROOTCMD mkdir -p $dir
-
-$ROOTCMD rm -rf /root/.unison
-$ROOTCMD ln -sf $dir /root
-$ROOTCMD ln -sf /q/p /
+if ! $ROOTCMD test -L /root/.unison; then
+    $ROOTCMD rm -rf /root/.unison
+    $ROOTCMD ln -s -T $dir /root/.unison
+fi
 
 $ROOTCMD chown -R 1000:1000 $dir
 while true; do
     $ROOTCMD chown 1000:1000 $dir
     $ROOTCMD chmod 700 $dir
     dir=$(dirname $dir)
-    [[ $dir != /q ]] || break
+    if [[ $dir == /p ]]; then break; fi
 done
+
+au --system -s /bin/false --home-dir /var/lib/bitcoind bitcoin