From: Chris Gianelloni Date: Sat, 29 Jan 2005 14:33:01 +0000 (+0000) Subject: Removed acpi from x86-archscript.sh as it breaks acpi calls on the command line. X-Git-Tag: CATALYST_2_0_6_916~834 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=07ddb3c51419202dbd07520aabf96d72e7189efb;p=catalyst.git Removed acpi from x86-archscript.sh as it breaks acpi calls on the command line. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@539 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 7a4306bc..cae6b9e5 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.165 2005/01/29 05:50:28 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.166 2005/01/29 14:33:00 wolf31o2 Exp $ + + 29 Jan 2005; Chris Gianelloni + livecd/runscript/x86-archscript.sh: + Removed acpi from x86-archscript.sh as it breaks acpi calls on the command + line. 29 Jan 2005; Chris Gianelloni catalyst: Version 1.1.4 diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh index b92f6c2c..f4189232 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.21 2005/01/28 20:23:05 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.22 2005/01/29 14:33:01 wolf31o2 Exp $ case $1 in kernel) @@ -81,16 +81,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=off ${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 ${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=off ${cmdline_opts} ${custom_kopts} cdroot vga=791 dokeymap splash=silent" >> ${icfg} + echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc ${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=off ${cmdline_opts} ${custom_kopts} cdroot" >> ${icfg} + echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot" >> ${icfg} echo >> ${icfg} echo " ${x}-nofb" >> ${kmsg} done