X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FFAIBASE%2F10-misc;fp=fai%2Fconfig%2Fscripts%2FFAIBASE%2F10-misc;h=7a0599dd727e86f54c8a7a775f8616f774e532fd;hb=7ade5e2c6113530c5f99cfc95880897fcb479f39;hp=fbf85c1efeb23e1acce1d1346adc8d64c3369d96;hpb=0f532bb1fcccbef349748700040318f882a2ac40;p=automated-distro-installer

diff --git a/fai/config/scripts/FAIBASE/10-misc b/fai/config/scripts/FAIBASE/10-misc
index fbf85c1..7a0599d 100755
--- a/fai/config/scripts/FAIBASE/10-misc
+++ b/fai/config/scripts/FAIBASE/10-misc
@@ -11,15 +11,14 @@ 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
-
-if [ -f $target/etc/hosts.orig ]; then
-    mv $target/etc/hosts.orig $target/etc/hosts
-fi
 fcopy -iM /etc/hosts /etc/motd
 
 # make /root accessible only by root
@@ -28,8 +27,10 @@ chown -c root:root $target/root
 # copy default dotfiles for root account
 fcopy -ir /root
 
-# use tmpfs for /tmp
-ainsl /etc/fstab "tmpfs     /tmp tmpfs     nodev,nosuid,size=50%,mode=1777   0    0"
+# 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