From: Chris Gianelloni Date: Tue, 14 Feb 2006 00:04:14 +0000 (+0000) Subject: Added IA64/SGI patch from plasmaroo. X-Git-Tag: CATALYST_2_0_6_916~409 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e959aefeae204c31c53c71fdf135ca1f1a4d46b2;p=catalyst.git Added IA64/SGI patch from plasmaroo. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1085 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 2645d6a4..f127b145 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.570 2006/02/13 22:26:44 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.571 2006/02/14 00:04:13 wolf31o2 Exp $ + + 14 Feb 2006; Chris Gianelloni + targets/support/bootloader-setup.sh: + Added IA64/SGI patch from plasmaroo. 13 Feb 2006; Chris Gianelloni catalyst, targets/livecd-stage1/livecd-stage1-controller.sh, diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index 239d67c9..1e87b26b 100755 --- 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.31 2006/02/08 21:48:10 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.32 2006/02/14 00:04:14 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -302,6 +302,7 @@ case ${clst_mainarch} in echo 'message=/efi/boot/elilo.msg' >> ${iacfg} echo 'chooser=simple' >> ${iacfg} echo 'timeout=50' >> ${iacfg} + echo 'relocatable' >> ${iacfg} echo >> ${iacfg} for x in ${clst_boot_kernel} do @@ -315,6 +316,11 @@ case ${clst_mainarch} in echo ' append="'initrd=${x}.igz ${default_append_line}' console=tty0 console=ttyS0,9600"' >> ${iacfg} echo " initrd=/efi/boot/${x}.igz" >> ${iacfg} echo >> ${iacfg} + echo "image=/efi/boot/${x}" >> ${iacfg} + echo " label=${x}-sgi">> ${iacfg} + echo ' append="'initrd=${x}.igz ${default_append_line}' console=tty0 console=ttySG0,115200"' >> ${iacfg} + echo " initrd=/efi/boot/${x}.igz" >> ${iacfg} + echo >> ${iacfg} mv $1/boot/${x}{,.igz} $1/boot/efi/boot done cp ${iacfg} $1/boot/efi/boot