Fixed a problem where we were putting the kernel name in twice and causing and error...

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

diff --git a/ChangeLog b/ChangeLog
index 7723cfcfedb7d8b9334a4723d312e0c44526917a..505b4b480107a29204162c62a7d01b089142d635 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.633 2006/06/15 22:18:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.634 2006/06/19 19:05:02 wolf31o2 Exp $
+
+  19 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/bootloader-setup.sh:
+  Fixed a problem where we were putting the kernel name in twice and causing
+  and error when using grub as a bootloader. This is for bug #137252.
 
   15 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/bootloader-setup.sh:

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index d5f28a8ee4209556701b5bf5c0e84fa7f91f8fea..4c3c1375fdaa02848a72dc5d19217a9496d21be1 100755 (executable)
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.37 2006/06/15 22:18:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.38 2006/06/19 19:05:02 wolf31o2 Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -492,7 +492,7 @@ case ${clst_mainarch} in
                                                fi
                                                echo >> ${icfg}
                                                echo "title ${x}-${y} [ No FrameBuffer ]" >> ${icfg}
-                                               echo "kernel ${x} /boot/${x} softlevel=${y} ${default_append_line}" >> ${icfg}
+                                               echo "kernel /boot/${x} softlevel=${y} ${default_append_line}" >> ${icfg}
                                                if [ -e $1/boot/${x}.igz ]
                                                then
                                                        echo "initrd /boot/${x}.igz" >> ${icfg}
@@ -516,7 +516,7 @@ case ${clst_mainarch} in
                                        fi
                                        echo >> ${icfg}
                                        echo "title ${x} [ No FrameBuffer ]" >> ${icfg}
-                                       echo "kernel ${x} /boot/${x} ${default_append_line}" >> ${icfg}
+                                       echo "kernel /boot/${x} ${default_append_line}" >> ${icfg}
                                        if [ -e $1/boot/${x}.igz ]
                                        then
                                                echo "initrd /boot/${x}.igz" >> ${icfg}