From: Michael Prokop <mika@grml.org>
Date: Sun, 16 Aug 2009 22:45:19 +0000 (+0200)
Subject: Fix usage of GRML_NAME in grml.cfg
X-Git-Tag: v0.9.21~16
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=856c63b73f382b3d45f2f674e8752c9fefd4529e

Fix usage of GRML_NAME in grml.cfg
---

diff --git a/grml-live b/grml-live
index adaff85..20b7f9a 100755
--- a/grml-live
+++ b/grml-live
@@ -672,8 +672,16 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       sed -i "s/%VERSION%/$VERSION/"           "$BUILD_OUTPUT"/boot/grub/grub.cfg
       sed -i "s/%GRML_NAME%/$SHORT_GRML_NAME/" "$BUILD_OUTPUT"/boot/grub/grub.cfg
 
+      if [ -r "${BUILD_OUTPUT}/boot/isolinux/${DISTRI_NAME}.cfg" ] ; then
+         sed -i "s/%VERSION%/$VERSION/"            "$BUILD_OUTPUT"/boot/isolinux/grml.cfg
+         sed -i "s/%GRML_LONG_NAME%/$DISTRI_NAME/" "$BUILD_OUTPUT"/boot/isolinux/grml.cfg
+         sed -i "s/%GRML_NAME%/$SHORT_GRML_NAME/"  "$BUILD_OUTPUT"/boot/isolinux/grml.cfg
+         sed -i "s/%ARCH%/$ARCH/"                  "$BUILD_OUTPUT"/boot/isolinux/grml.cfg
+      fi
+
       sed -i "s/%VERSION%/$VERSION/"           "$BUILD_OUTPUT"/boot/isolinux/grml.cfg
-      sed -i "s/%GRML_NAME%/$GRML_NAME/"       "$BUILD_OUTPUT"/boot/isolinux/grml.cfg
+      sed -i "s/%GRML_LONG_NAME%/$GRML_NAME/"  "$BUILD_OUTPUT"/boot/isolinux/grml.cfg
+      sed -i "s/%GRML_NAME%/$SHORT_GRML_NAME/" "$BUILD_OUTPUT"/boot/isolinux/grml.cfg
       sed -i "s/%ARCH%/$ARCH/"                 "$BUILD_OUTPUT"/boot/isolinux/grml.cfg
 
       sed -i "s/%DISTRI_INFO%/$DISTRI_INFO/" "$BUILD_OUTPUT"/boot/isolinux/vesamenu.cfg
diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index 3bf086a..9fe5e9e 100644
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -3,7 +3,7 @@
 # generic ones
 label grml
   menu DEFAULT
-  menu label Grml ^Default Mode (%GRML_NAME% %VERSION%, %ARCH%)
+  menu label Grml ^Default Mode (%GRML_LONG_NAME% %VERSION%, %ARCH%)
   kernel /boot/%GRML_NAME%/linux26
   append apm=power-off vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz live-media-path=/live/grml/ boot=live nomce lang=de