small bug fixes and improvements

[automated-distro-installer] / fai / config / distro-install-common / end

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index b55295232e614959ff7daf2ba16c302fe9c086ab..6afcd1eaf5f75cf22e52b8893679b74cd92b352a 100755 (executable)
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -9,9 +9,9 @@ if [[ $EUID != 0 ]]; then
 fi
 
 ### begin set hostname
-echo $hostname > /etc/hostname
+echo $HOSTNAME > /etc/hostname
 sed -i '/^127\.0\.1\.1/d' /etc/hosts
-echo "127.0.1.1 $hostname" >> /etc/hosts
+echo "127.0.1.1 $HOSTNAME" >> /etc/hosts
 hostname -F /etc/hostname
 ### end set hostname
 
@@ -33,19 +33,16 @@ 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"
     fi
 }
 au() {
     if ! $ROOTCMD getent passwd $1; then
-        $ROOTCMD useradd -m $1 -s /bin/bash || [[ $? == 9 ]]
+        $ROOTCMD useradd -m -s /bin/bash $1 || [[ $? == 9 ]]
     fi
 }
 
-echo "IANNNNNNN 222222222, $ROOTPW"
-ls -la $ROOTPW
-
 chpw root "$ROOTPW"
 # 9 = user already exists. so we are idempotent.
 au ian
@@ -65,7 +62,7 @@ $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
@@ -79,11 +76,12 @@ fi
 
 dir=/q/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 rm -rf /root/.unison
-$ROOTCMD ln -sf $dir /root
 $ROOTCMD ln -sf /q/p /
-
 $ROOTCMD chown -R 1000:1000 $dir
 while true; do
     $ROOTCMD chown 1000:1000 $dir