X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fdistro-install-common%2Fend;h=3b07687d9fa636c897891def4c4305ab5051d149;hb=187171cf7e0b0ef3fa07458a3536f98074416c0a;hp=bc4e816bad77d2e36f3e88548421a1f71a474eed;hpb=1728af7e3060c8608c622f210d6e16f7d085d8f9;p=automated-distro-installer

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index bc4e816..3b07687 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"
@@ -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
 
+getent group docker &>/dev/null || groupadd -r docker
+usermod -a -G docker ian
 
 # based on unison error, with 8192 from
 # sysctl -a | grep fs.inotify.max_user_watches
@@ -66,7 +81,6 @@ if [[ ! -e $f ]] || ! grep -xF "$line" $f; then
     echo "$line" >> $f
 fi
 
-
 dir=/p/c/machine_specific/$HOSTNAME/.unison
 $ROOTCMD mkdir -p $dir
 if ! $ROOTCMD test -L /root/.unison; then