[Fai-commit] r4328 - trunk/bin

[lange at alioth.debian.org]

Author: lange
Date: 2007-06-13 10:37:38 +0000 (Wed, 13 Jun 2007)
New Revision: 4328

Modified:
   trunk/bin/fai-cd
Log:
use stage2 binary from inside the nfsroot, not from the host system


Modified: trunk/bin/fai-cd
===================================================================
--- trunk/bin/fai-cd	2007-06-12 21:48:10 UTC (rev 4327)
+++ trunk/bin/fai-cd	2007-06-13 10:37:38 UTC (rev 4328)
@@ -30,7 +30,7 @@
 #*********************************************************************
 
 set -e 
-version="fai-cd 3.0, 12 june 2007"
+version="fai-cd 3.0.1, 13 june 2007"
 
 burn=0
 hidedirs="/usr/share/locale /usr/share/doc /var/lib/apt /var/cache/apt /usr/share/man /var/lib/dpkg/info /media/mirror/aptcache /media/mirror/.apt-move"
@@ -67,9 +67,9 @@
     echo -n "Creating grub boot image ..."
 
     mkdir -p $tmp/boot/grub $nfsrootdir
-    [ -d /usr/lib/grub ] && cp /usr/lib/grub/i386-pc/stage2_eltorito $tmp/boot/grub/
+    [ -d $NFSROOT//usr/lib/grub ] && cp $NFSROOT/usr/lib/grub/i386-pc/stage2_eltorito $tmp/boot/grub/
     # for sarge
-    [ -d /lib/grub ] && cp /lib/grub/i386-pc/stage2_eltorito $tmp/boot/grub/
+    [ -d $NFSROOT/lib/grub ] && cp $NFSROOT/lib/grub/i386-pc/stage2_eltorito $tmp/boot/grub/
     cp $grub_config $tmp/boot/grub
     # insert date into grub menu
     perl -pi -e "s/_VERSIONSTRING_/   $isoversion     /" $tmp/boot/grub/menu.lst