Use menu.lst for grub config, since 0.96 and higher won't use grub.conf for eltorito

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1386 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 09700390012de39f1deb306a082fb956857bf097..5756821cd643c355a361ef15733fe439b3ad2117 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  05 Apr 2008; Andrew Gaffney <agaffney@gentoo.org>
+  targets/support/bootloader-setup.sh:
+  Use menu.lst for grub config, since 0.96 and higher won't use grub.conf
+  for eltorito
+
   04 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> +TODO,
   modules/generic_stage_target.py, targets/support/livecdfs-update.sh:
   Added TODO. Changed create_handbook_icon call to only be called if

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index cb055ac30e649ca661e778fb7e616098513194b3..2df604066919e236393de5cb0674e470875efaea 100755 (executable)
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -336,7 +336,7 @@ case ${clst_hostarch} in
 
                if [ -e $1/boot/grub/stage2_eltorito ]
                then
-                       icfg=$1/boot/grub/grub.conf
+                       icfg=$1/boot/grub/menu.lst
                        echo "default 0" > ${icfg}
                        echo "timeout 15" >> ${icfg}
                        echo "pager on" >> ${icfg}