From e6ceb5306f20a1f294cfe90a1996ad35efa3f29f Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 28 Jan 2005 19:23:43 +0000 Subject: [PATCH] Changed acpi=ht to acpi=off. This fixes acpi loading and also allows for users to use apm. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@531 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- livecd/runscript/x86-archscript.sh | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 052f5daf..3e06f170 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.157 2005/01/28 18:37:23 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.158 2005/01/28 19:23:43 wolf31o2 Exp $ + + 28 Jan 2005; Chris Gianelloni + livecd/runscript/x86-archscript.sh: + Changed acpi=ht to acpi=off. This fixes acpi loading and also allows for + users to use apm. 28 Jan 2005; Chris Gianelloni targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh index 2ac35add..db38481a 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.19 2004/12/17 21:06:36 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.20 2005/01/28 19:23:43 wolf31o2 Exp $ case $1 in kernel) @@ -79,16 +79,16 @@ case $1 in if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] then - echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=ht ${cmdline_opts} ${custom_kopts} cdroot vga=791 dokeymap splash=silent,theme:${clst_livecd_splash_theme}" >> ${icfg} + echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot vga=791 dokeymap splash=silent,theme:${clst_livecd_splash_theme}" >> ${icfg} else - echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=ht ${cmdline_opts} ${custom_kopts} cdroot vga=791 dokeymap splash=silent" >> ${icfg} + echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot vga=791 dokeymap splash=silent" >> ${icfg} fi 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=ht ${cmdline_opts} ${custom_kopts} cdroot" >> ${icfg} + echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot" >> ${icfg} echo >> ${icfg} echo " ${x}-nofb" >> ${kmsg} done -- 2.26.2