[Fai-commit] r4386 - trunk/bin

[lange at alioth.debian.org]

Author: lange
Date: 2007-07-05 20:21:01 +0000 (Thu, 05 Jul 2007)
New Revision: 4386

Modified:
   trunk/bin/fai-cd
   trunk/bin/fai-mirror
Log:
use $NFSROOT/live/filesystem.dir


Modified: trunk/bin/fai-cd
===================================================================
--- trunk/bin/fai-cd	2007-07-05 19:38:25 UTC (rev 4385)
+++ trunk/bin/fai-cd	2007-07-05 20:21:01 UTC (rev 4386)
@@ -65,7 +65,7 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - -
 create_grub_image() {
 
-    mkdir -p $tmp/boot/grub $nfsrootdir
+    mkdir -p $tmp/boot/grub $nfsrootdir/live/filesystem.dir
 
     [ -d $NFSROOT/usr/lib/grub ] && cp $NFSROOT/usr/lib/grub/i386-pc/stage2_eltorito $tmp/boot/grub/
     [ -d $NFSROOT/usr/lib/grub ] && cp $NFSROOT/usr/lib/grub/i386-pc/stage2 $tmp/boot/grub/
@@ -217,6 +217,8 @@
 [ "$verbose" ] && echo "Using configuration files from $cfdir"
 . $cfdir/fai.conf
 export NFSROOT=$(source $cfdir/make-fai-nfsroot.conf; echo $NFSROOT)
+NFSROOT="$NFSROOT/live/filesystem.dir"
+
 [ -d "$NFSROOT/etc/fai" ] || die 10 "Please create NFSROOT by calling make-fai-nfsroot or fai-setup."
 
 if [ -z "$grub_config" ]; then

Modified: trunk/bin/fai-mirror
===================================================================
--- trunk/bin/fai-mirror	2007-07-05 19:38:25 UTC (rev 4385)
+++ trunk/bin/fai-mirror	2007-07-05 20:21:01 UTC (rev 4386)
@@ -25,7 +25,7 @@
 # MA 02111-1307, USA.
 #*********************************************************************
 
-version="Version 1.9.4, 23-june-2007"
+version="Version 1.9.5, 5-july-2007"
 
 # variables: NFSROOT, FAI_CONFIGDIR
 
@@ -251,6 +251,7 @@
 [ "$verbose" ] && echo "Using configuration files from $cfdir"
 . $cfdir/fai.conf
 . $cfdir/make-fai-nfsroot.conf
+export NFSROOT="$NFSROOT/live/filesystem.dir"
 
 [ -n "$packages" ] && die "WARNING: The use of \$packages in make-fai-nfsroot.conf is now deprecated. Please include this information into $cfdir/NFSROOT."
 [ -n "$NFSROOT_PACKAGES" ] && die "WARNING: The use of \$packages in make-fai-nfsroot.conf is now deprecated. Please include this information into $cfdir/NFSROOT."