[Fai-commit] r4744 - trunk/bin

[lange at alioth.debian.org]

Author: lange
Date: 2007-11-15 11:36:13 +0000 (Thu, 15 Nov 2007)
New Revision: 4744

Modified:
   trunk/bin/make-fai-nfsroot
Log:
create or copy live.conf


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2007-11-14 21:12:08 UTC (rev 4743)
+++ trunk/bin/make-fai-nfsroot	2007-11-15 11:36:13 UTC (rev 4744)
@@ -288,8 +288,17 @@
     echo 'NTPSERVERS=""' > etc/default/ntp-servers
 
     # live.conf will set hostname to debian
-    cp /dev/null etc/live.conf
-
+    if [ -f $cfdir/live.conf ]; then
+	cp -p $cfdir/live.conf etc/live.conf
+    else
+	cat >> etc/live.conf <<EOF
+# UNIONTYPE=aufs # if unionfs is broken
+NOUSER="Yes"
+NOHOSTS="Yes"
+export UNIONTYPE NOHOSTS NOUSER
+EOF
+    fi
+    
     cp -a $cfdir/apt $NFSROOT/etc
 
     ainsl -as $NFSROOT/etc/hosts "127.0.0.1 localhost"