From: Chris Gianelloni Date: Thu, 15 Jun 2006 22:18:51 +0000 (+0000) Subject: Added a second pass to the alpha bootloader setup to create aboot items for serial... X-Git-Tag: CATALYST_2_0_6_916~346 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b38308b5868bf21d94414e0aa0eefbd35b9aa863;p=catalyst.git Added a second pass to the alpha bootloader setup to create aboot items for serial console for bug #133457. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1148 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 7244a74f..7723cfcf 100644 --- 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.632 2006/06/12 20:41:53 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.633 2006/06/15 22:18:51 wolf31o2 Exp $ + + 15 Jun 2006; Chris Gianelloni + targets/support/bootloader-setup.sh: + Added a second pass to the alpha bootloader setup to create aboot items for + serial console for bug #133457. 12 Jun 2006; Chris Gianelloni +livecd/cdtar/arcload-0.43-r1.tbz2: diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index b259cfc7..d5f28a8e 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.36 2006/04/20 15:17:01 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.37 2006/06/15 22:18:51 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -20,6 +20,16 @@ case ${clst_mainarch} in # NO SOFTLEVEL SUPPORT YET acfg=$1/etc/aboot.conf bctr=0 + # Pass 1 is for non-serial + for x in ${clst_boot_kernel} + do + echo -n "${bctr}:/boot/${x} " >> ${acfg} + echo -n "initrd=/boot/${x}.igz root=/dev/ram0 " >> ${acfg} + echo "init=/linuxrc ${cmdline_opts} cdroot" >> ${acfg} + ((bctr=${bctr}+1)) + done + # Pass 2 is for serial + cmdline_opts="${cmdline_opts} console=ttyS0" for x in ${clst_boot_kernel} do echo -n "${bctr}:/boot/${x} " >> ${acfg}