X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fdistro-install-common%2Fend;h=e764c32ea67367e21a887e518926694071f999d3;hb=cef9b6ede5c1e028bed1b4dc7895f5dfa121ad6b;hp=8ae323c7c805ccb68cb61a9979a57bd33df50475;hpb=3d9cc96092cdc8aa05bc95cf83c07bb1af692013;p=automated-distro-installer

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index 8ae323c..e764c32 100755
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -10,18 +10,19 @@ 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
+  # outside of fai context or setting up a brand new host, we skip this
   cp -rT $src $dst
 fi
 
 USER2PW=/q/root/shadow/user2
-if ifclass ziva; then
-  ROOTPW=/q/root/shadow/ziva
-else
-  ROOTPW=/q/root/shadow/standard
+# if doesn't exist, we dont set one
+ROOTPW=/q/root/shadow/standard
+if [[ ! -e $ROOTPW ]]; then
+  ROOTPW=/q/root/shadow/$HOSTNAME
 fi
 
 chpw() {
@@ -74,7 +75,7 @@ $ROOTCMD usermod -a -G docker iank
 f=$target/etc/sysctl.d/99-sysctl.conf
 key=fs.inotify.max_user_watches
 if [[ -e $f ]]; then sed -ri --follow-symlinks "/^\s*$key\s*=/d" $f; fi
-echo "fs.inotify.max_user_watches = 1000000" >> $f
+echo "fs.inotify.max_user_watches = 50000" >> $f
 # applies it. it would be also be applied after a reboot
 $ROOTCMD sysctl --system
 
@@ -84,19 +85,5 @@ 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
-  $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)
-  if [[ $dir == /p ]]; then break; fi
-done
 
 au --system -s /bin/false --home-dir /var/lib/bitcoind bitcoin