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

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index d226af6..f230d3c 100755
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -8,6 +8,19 @@ if [[ $EUID != 0 ]]; then
     exit 1
 fi
 
+# 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_STABLE_BOOTSTRAP; then
+    exit 0
+fi
+
 TPW=/q/root/shadow/traci-simple
 if ifclass tp; then
     ROOTPW="$TPW"
@@ -30,9 +43,9 @@ chpw() {
         echo "$0: warning: no pw set for $user" >&2
     fi
 }
-au() {
-    if ! $ROOTCMD getent passwd $1; then
-        $ROOTCMD useradd -m -s /bin/bash $1 || [[ $? == 9 ]]
+au() { # add user
+    if ! $ROOTCMD getent passwd ${@: -1}; then
+        $ROOTCMD useradd -m -s /bin/bash $@
     fi
 }
 
@@ -48,6 +61,8 @@ fi
 # comparing ian's groups to traci, I see none she should join on arch
 $ROOTCMD usermod -a -G traci ian
 
+$ROOTCMD getent group docker &>/dev/null || $ROOTCMD groupadd -r docker
+$ROOTCMD usermod -a -G docker ian
 
 # based on unison error, with 8192 from
 # sysctl -a | grep fs.inotify.max_user_watches
@@ -66,19 +81,19 @@ 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
 if ! $ROOTCMD test -L /root/.unison; then
     $ROOTCMD rm -rf /root/.unison
     $ROOTCMD ln -s -T $dir /root/.unison
 fi
 
-$ROOTCMD ln -sf /q/p /
 $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 -s /bin/false --home-dir /var/lib/bitcoind bitcoin