Set default for grub to 0 and updated cdtar so we don't ship a half-broken help.msg...

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

diff --git a/ChangeLog b/ChangeLog
index 230ebb1a4ede47c5601a4283181e21bcc3b7c3a9..45a78a5a73d0e4bc6a1aac53fcaa0380ce757878 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/cdtar/grub-memtest86+-cdtar.tar.bz2,
+  targets/support/bootloader-setup.sh:
+  Set default for grub to 0 and updated cdtar so we don't ship a half-broken
+  help.msg which we didn't even use.
+
   28 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/bootloader-setup.sh:
   Don't write out out 'default 1' line when creating grub.conf, since the

diff --git a/livecd/cdtar/grub-memtest86+-cdtar.tar.bz2 b/livecd/cdtar/grub-memtest86+-cdtar.tar.bz2
index 2f44963e002db8e65248d7fa2a7fc9f2f326039f..c0d62e7f3e193224c60544f49c149d259fbf3bcb 100644 (file)
Binary files a/livecd/cdtar/grub-memtest86+-cdtar.tar.bz2 and b/livecd/cdtar/grub-memtest86+-cdtar.tar.bz2 differ

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