[Fai-commit] r3956 - trunk/bin

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-09-14 14:23:34 +0000 (Thu, 14 Sep 2006)
New Revision: 3956

Modified:
   trunk/bin/fai-cd
   trunk/bin/make-fai-bootfloppy
Log:
change grub pathes


Modified: trunk/bin/fai-cd
===================================================================
--- trunk/bin/fai-cd	2006-09-14 12:21:40 UTC (rev 3955)
+++ trunk/bin/fai-cd	2006-09-14 14:23:34 UTC (rev 3956)
@@ -30,7 +30,7 @@
 #*********************************************************************
 
 set -e 
-version="fai-cd 2.4, 12 september 2006"
+version="fai-cd 2.4.1, 14 september 2006"
 
 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"
@@ -77,7 +77,7 @@
     echo -n "Creating grub boot image ..."
 
     > $tmp/boot/RUNNING_FROM_FAICD
-    cp /lib/grub/i386-pc/stage2_eltorito $tmp/boot/grub/
+    cp /usr/lib/grub/i386-pc/stage2_eltorito $tmp/boot/grub/
     cp $grub_config $tmp/boot/grub/menu.lst
     # insert date into grub menu
     perl -pi -e "s/_VERSIONSTRING_/   $isoversion     /" $tmp/boot/grub/menu.lst

Modified: trunk/bin/make-fai-bootfloppy
===================================================================
--- trunk/bin/make-fai-bootfloppy	2006-09-14 12:21:40 UTC (rev 3955)
+++ trunk/bin/make-fai-bootfloppy	2006-09-14 14:23:34 UTC (rev 3956)
@@ -27,7 +27,7 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #*********************************************************************
 
-version="Version 2.8.2, 13-september-2006"
+version="Version 2.8.3, 14-september-2006"
 set -e
 
 timeout=15
@@ -220,7 +220,7 @@
     mkdir -p $mountpoint/boot/grub
     echo "(fd0)   /dev/fd0" > $mountpoint/boot/grub/device.map
     [ "$verbose" ] && echo "Copying the kernel $NFSROOT/boot/$kernel to the floppy."
-    cp -p $NFSROOT/lib/grub/i386-pc/stage? $mountpoint/boot/grub
+    cp -p $NFSROOT/usr/lib/grub/i386-pc/stage? $mountpoint/boot/grub
     cp $NFSROOT/boot/$kernel $mountpoint
 
     grubconf="
@@ -249,7 +249,7 @@
 $sd
 "
     echo "$grubconf" > $mountpoint/boot/grub/menu.lst
-    $NFSROOT/sbin/grub --batch --device-map=$mountpoint/boot/grub/device.map >/dev/null <<EOF
+    $NFSROOT/usr/sbin/grub --batch --device-map=$mountpoint/boot/grub/device.map >/dev/null <<EOF
 device (fd0) $floppydev
 root (fd0)
 setup (fd0)