From: Michael Prokop <devnull@localhost>
Date: Wed, 20 Feb 2008 16:32:10 +0000 (+0100)
Subject: Adjust grml2ram in isolinux.cfg as well
X-Git-Tag: 0.5~2
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=4ea5fda2a213fc7e8722cc900c37eeddd27415f2;hp=f941fe942637ddd1b383ae2de90dfb2a3e8bd9eb

Adjust grml2ram in isolinux.cfg as well
---

diff --git a/grml-live b/grml-live
index e64f285..6116195 100755
--- a/grml-live
+++ b/grml-live
@@ -517,6 +517,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
 
       # make sure the squashfs filename is set accordingly:
       GRML_NAME_SQUASHFS="$GRML_NAME.squashfs"
+      sed -i "s/%GRML_NAME_SQUASHFS%/$GRML_NAME_SQUASHFS/" "$BUILD_OUTPUT"/boot/isolinux/isolinux.cfg
       sed -i "s/%GRML_NAME_SQUASHFS%/$GRML_NAME_SQUASHFS/" "$BUILD_OUTPUT"/boot/isolinux/syslinux.cfg
 
       GRML_NAME_SQUASHFS="$(cut_string 20 "$GRML_NAME_SQUASHFS")"
diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg
index 74f3c12..808e9a1 100644
--- a/templates/boot/isolinux/isolinux.cfg
+++ b/templates/boot/isolinux/isolinux.cfg
@@ -34,7 +34,7 @@ LABEL grml2ram
 MENU LABEL grml2ram - Copy Squashfs file to RAM
 MENU DEFAULT
 KERNEL /boot/%GRML_NAME%/linux26
-APPEND apm=power-off toram=grml.squashfs lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
+APPEND apm=power-off toram=%GRML_NAME_SQUASHFS% lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL splash
 MENU LABEL grml - Bootsplash