[or-cvs] r11358: Let autoconfig load the ACPI modules. (in incognito/trunk: arch/x86/overlay/isolinux arch/x86/overlay.tiny/isolinux root_overlay/etc/modules.autoload.d)

[double at seul.org]

Author: double
Date: 2007-09-03 12:20:02 -0400 (Mon, 03 Sep 2007)
New Revision: 11358

Modified:
   incognito/trunk/arch/x86/overlay.tiny/isolinux/isolinux.cfg
   incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg
   incognito/trunk/root_overlay/etc/modules.autoload.d/kernel-2.6
Log:
Let autoconfig load the ACPI modules.


Modified: incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg
===================================================================
--- incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg	2007-09-03 12:09:39 UTC (rev 11357)
+++ incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg	2007-09-03 16:20:02 UTC (rev 11358)
@@ -18,46 +18,46 @@
 label gentoo-zh
   menu label Chinese
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 quiet lang=zh keymap=zh
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=zh keymap=zh
 
 label gentoo-en
   menu label English
   menu default
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 quiet
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet
 
 label gentoo-fa
   menu label Farsi
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 quiet lang=fa keymap=fa
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=fa keymap=fa
 
 label gentoo-fr
   menu label French
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 quiet lang=fr keymap=fr
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=fr keymap=fr
 
 label gentoo-de
   menu label German
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 quiet lang=de keymap=de
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=de keymap=de
 
 label gentoo-it
   menu label Italian
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 quiet lang=it keymap=it
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=it keymap=it
 
 label gentoo-ja
   menu label Japanese
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 quiet lang=ja keymap=ja
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=ja keymap=ja
 
 label gentoo-pt
   menu label Portuguese
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 quiet lang=pt keymap=pt
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=pt keymap=pt
 
 label gentoo-es
   menu label Spanish
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 quiet lang=es keymap=es
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=es keymap=es
 

Modified: incognito/trunk/arch/x86/overlay.tiny/isolinux/isolinux.cfg
===================================================================
--- incognito/trunk/arch/x86/overlay.tiny/isolinux/isolinux.cfg	2007-09-03 12:09:39 UTC (rev 11357)
+++ incognito/trunk/arch/x86/overlay.tiny/isolinux/isolinux.cfg	2007-09-03 16:20:02 UTC (rev 11358)
@@ -18,21 +18,21 @@
 label gentoo
   menu label Normal
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 quiet
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet
 
 label gentoo-docache
   menu label Normal - Run from RAM
   menu default
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap docache initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 quiet
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap docache initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet
 
 label gentoo-nox
   menu label No Graphical Login
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap nox initrd=gentoo.igz
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap nox initrd=gentoo.igz acpi=on
 
 label gentoo-docache-nox
   menu label No Graphical Login - Run from RAM
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap nox docache initrd=gentoo.igz
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap nox docache initrd=gentoo.igz acpi=on
 

Modified: incognito/trunk/root_overlay/etc/modules.autoload.d/kernel-2.6
===================================================================
--- incognito/trunk/root_overlay/etc/modules.autoload.d/kernel-2.6	2007-09-03 12:09:39 UTC (rev 11357)
+++ incognito/trunk/root_overlay/etc/modules.autoload.d/kernel-2.6	2007-09-03 16:20:02 UTC (rev 11358)
@@ -14,12 +14,3 @@
 ip_tables
 x_tables
 
-# ACPI
-ac
-battery
-button
-fan
-processor
-thermal
-video
-