X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FFAIBASE%2F10-misc;h=7a0599dd727e86f54c8a7a775f8616f774e532fd;hb=683400c6a28e49f3db1fc1bd051b7fc3efc63336;hp=6394ad2fbb00c79135afab20408bd9e4e398a466;hpb=3bd65f0ca635f1349626c2393a4dd8a50df64f54;p=automated-distro-installer

diff --git a/fai/config/scripts/FAIBASE/10-misc b/fai/config/scripts/FAIBASE/10-misc
index 6394ad2..7a0599d 100755
--- a/fai/config/scripts/FAIBASE/10-misc
+++ b/fai/config/scripts/FAIBASE/10-misc
@@ -5,14 +5,20 @@
 error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 
 echo $TIMEZONE    > $target/etc/timezone
-cp -f /usr/share/zoneinfo/${TIMEZONE} $target/etc/localtime
+if [ -L $target/etc/localtime ]; then
+    ln -sf /usr/share/zoneinfo/${TIMEZONE} $target/etc/localtime
+else
+    cp -f /usr/share/zoneinfo/${TIMEZONE} $target/etc/localtime
+fi
 
+if [ -f $target/etc/hosts.orig ]; then
+    mv $target/etc/hosts.orig $target/etc/hosts
+fi
 if [ -n "$IPADDR" ]; then
     ifclass DHCPC || ainsl -s /etc/hosts "$IPADDR $HOSTNAME.$DOMAIN $HOSTNAME"
 else
     ifclass DHCPC && ainsl -s /etc/hosts "127.0.0.1 $HOSTNAME"
 fi
-
 fcopy -iM /etc/hosts /etc/motd
 
 # make /root accessible only by root
@@ -21,6 +27,10 @@ chown -c root:root $target/root
 # copy default dotfiles for root account
 fcopy -ir /root
 
+# use tmpfs for /tmp if not defined in disk_config
+if ! grep -Pq '\s/tmp\s' $target/etc/fstab; then
+    ainsl /etc/fstab "tmpfs     /tmp tmpfs     nodev,nosuid,size=50%,mode=1777   0    0"
+fi
 chmod -c 1777 ${target}/tmp
 chown -c 0:0  ${target}/tmp