[Fai-commit] r5913 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2010-07-30 04:07:08 +0000 (Fri, 30 Jul 2010)
New Revision: 5913

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
make-fai-nfsroot: minor cleanup

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2010-07-30 03:42:57 UTC (rev 5912)
+++ trunk/bin/make-fai-nfsroot	2010-07-30 04:07:08 UTC (rev 5913)
@@ -320,9 +320,8 @@
     fi
 
     # hoaks some packages
-    # liloconfig, dump and raidtool2 needs these files
+    # liloconfig, dump needs these files
     echo "# UNCONFIGURED FSTAB FOR BASE SYSTEM" > etc/fstab
-    > etc/raidtab
     echo 'NTPSERVERS=""' > etc/default/ntp-servers
 
     cp -La $cfdir/apt $NFSROOT/etc
@@ -344,12 +343,7 @@
     if [ -f $cfdir/live.conf ]; then
 	cp -Lp $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
+	die "$cfdir/live.conf not found."
     fi
 
     LC_ALL=C call_with_stamp add_packages_nfsroot

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-30 03:42:57 UTC (rev 5912)
+++ trunk/debian/changelog	2010-07-30 04:07:08 UTC (rev 5913)
@@ -95,6 +95,7 @@
   * fai-server.install, updatebase, make-fai-nfsroot, Makefile: remove
     fai-start-stop-daemon
   * get-config-dir: change error message
+  * make-fai-nfsroot: minor cleanup
     
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.3