From: Chris Gianelloni Date: Tue, 5 Jul 2005 17:48:21 +0000 (+0000) Subject: Removing acpi=off from default kernel arguments and adding ia64 livecd-stage2 support... X-Git-Tag: CATALYST_2_0_6_916~704 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=897ba53a58cb0d99f9dd05ba74978972d59f411a;p=catalyst.git Removing acpi=off from default kernel arguments and adding ia64 livecd-stage2 support functions and cdtar. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@736 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index df49d69b..5eb91559 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.283 2005/06/30 16:07:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.284 2005/07/05 17:48:21 wolf31o2 Exp $ + + 05 Jul 2005; Chris Gianelloni + targets/support/bootloader-setup.sh: + Removing acpi=off from default kernel arguments and adding ia64 + livecd-stage2 support functions and cdtar. 30 Jun 2005; Chris Gianelloni targets/support/bootloader-setup.sh, targets/support/pre-kmerge.sh: diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index 5368d563..08354836 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.9 2005/07/05 17:20:05 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.10 2005/07/05 17:48:21 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -13,7 +13,7 @@ check_dev_manager check_bootargs check_filesystem_type -default_append_line="initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot" +default_append_line="initrd=${x}.igz root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot" case ${clst_mainarch} in alpha)