From: John P. Davis Date: Fri, 15 Oct 2004 02:54:16 +0000 (+0000) Subject: changing acpi=off to acpi=ht X-Git-Tag: CATALYST_2_0_6_916~908 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=815ebfacac7f79617c90ca49954a9df038c28dd3;p=catalyst.git changing acpi=off to acpi=ht git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@465 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index c3612190..fa9f7cd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.95 2004/10/15 02:48:20 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.96 2004/10/15 02:54:16 zhen Exp $ + + 14 Oct 2004; livecd/runscript/x86-archscript.sh: + acpi=off changed to acpi=ht. enables HT automatically for intel users, but + should not hurt non-HT users 12 Oct 2004; John Davis targets/embedded/cramfs-runscript.sh, targets/embedded/embedded-chroot.sh, diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh index f072240b..af566f52 100644 --- a/livecd/runscript/x86-archscript.sh +++ b/livecd/runscript/x86-archscript.sh @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.11 2004/10/15 02:40:00 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.12 2004/10/15 02:54:16 zhen Exp $ case $1 in kernel) @@ -76,12 +76,12 @@ case $1 in echo >> ${icfg} echo "label ${x}" >> ${icfg} echo " kernel ${x}" >> ${icfg} - echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot vga=791 splash=silent" >> ${icfg} + echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=ht ${cmdline_opts} ${custom_kopts} cdroot vga=791 splash=silent" >> ${icfg} echo >> ${icfg} echo " ${x}" >> ${kmsg} echo "label ${x}-nofb" >> ${icfg} echo " kernel ${x}" >> ${icfg} - echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot" >> ${icfg} + echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=ht ${cmdline_opts} ${custom_kopts} cdroot" >> ${icfg} echo >> ${icfg} echo " ${x}-nofb" >> ${kmsg} done