[Fai-commit] r4786 - trunk/bin

[lange at alioth.debian.org]

Author: lange
Date: 2007-11-22 13:09:56 +0000 (Thu, 22 Nov 2007)
New Revision: 4786

Modified:
   trunk/bin/make-fai-nfsroot
Log:
create life.conf after fai-nfsroot and live-initramfs is installed,
overwrite live.conf, do not append to it
live.conf may be written before if --force-confold would work in m-f-n


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2007-11-22 10:35:48 UTC (rev 4785)
+++ trunk/bin/make-fai-nfsroot	2007-11-22 13:09:56 UTC (rev 4786)
@@ -288,18 +288,6 @@
     > etc/raidtab
     echo 'NTPSERVERS=""' > etc/default/ntp-servers
 
-    # live.conf will set hostname to debian
-    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"
@@ -314,6 +302,19 @@
 EOF
     echo "Upgrading $NFSROOT"
     LC_ALL=C call_verbose call_with_stamp upgrade_nfsroot  
+
+    # overwrite default 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
+
     LC_ALL=C call_with_stamp add_packages_nfsroot
     call_with_stamp copy_fai_files