diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-06-19 19:05:02 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-06-19 19:05:02 +0000 |
| commit | da4399afffdb138e41c70ca8a13a2436b5b2feb8 (patch) | |
| tree | 90dbba3dcded0b63ddd8f7cdac1e9072a77fccfc /src/catalyst | |
| parent | fix from Piotr Lipski (diff) | |
| download | gentoo-da4399afffdb138e41c70ca8a13a2436b5b2feb8.tar.gz gentoo-da4399afffdb138e41c70ca8a13a2436b5b2feb8.tar.bz2 gentoo-da4399afffdb138e41c70ca8a13a2436b5b2feb8.zip | |
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.
Diffstat (limited to 'src/catalyst')
| -rw-r--r-- | src/catalyst/ChangeLog | 7 | ||||
| -rw-r--r-- | src/catalyst/targets/support/bootloader-setup.sh | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index b63335ba87..0a1141fd73 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.633 2006/06/15 22:18:51 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/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/src/catalyst/targets/support/bootloader-setup.sh b/src/catalyst/targets/support/bootloader-setup.sh index d5f28a8ee4..4c3c1375fd 100644 --- a/src/catalyst/targets/support/bootloader-setup.sh +++ b/src/catalyst/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} |