From 856c63b73f382b3d45f2f674e8752c9fefd4529e Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 17 Aug 2009 00:45:19 +0200 Subject: [PATCH] Fix usage of GRML_NAME in grml.cfg --- grml-live | 10 +++++++++- templates/boot/isolinux/grml.cfg | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) 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 -- 2.1.4