X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fdistro-install-common%2Fend;h=3735142d3507aa798e1f5d36cceafc61e0a511d6;hb=0a2a4d11ef323da19d0cebe2f5ec7b1be7bd15bc;hp=390c20487c4c944b4dfd96a81d1b13b313f33eca;hpb=affd7d3cdd0671dcca07f29de9c86b5e3b57ea1f;p=automated-distro-installer

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index 390c204..3735142 100755
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -8,13 +8,6 @@ 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
-
 TPW=/q/root/shadow/traci-simple
 if ifclass tp; then
     ROOTPW="$TPW"
@@ -34,7 +27,7 @@ chpw() {
     if [[ $pwfile && -e $pwfile ]]; then
         printf "$user:" | cat - "$pwfile" | $ROOTCMD chpasswd -e
     else
-        echo "$0: warning: no pw set for $user"
+        echo "$0: warning: no pw set for $user" >&2
     fi
 }
 au() {
@@ -74,14 +67,17 @@ if [[ ! -e $f ]] || ! grep -xF "$line" $f; then
 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