no, ipmi is still not fine on some machines (since acpi got enabled)

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 8945fed..ff6f19a 100644 (file)
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#      $OpenBSD: GENERIC,v 1.237 2008/06/30 00:03:15 ian Exp $
+#      $OpenBSD: GENERIC,v 1.238 2008/07/20 22:17:50 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -50,7 +50,7 @@ acpiprt*      at acpi?
 acpitz*                at acpi?
 acpithinkpad*  at acpi?
 
-ipmi0  at mainbus?             # IPMI
+ipmi0  at mainbus? disable     # IPMI
 
 option         PCIVERBOSE
 option         USBVERBOSE

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index c3f068e..873c90d 100644 (file)
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#      $OpenBSD: GENERIC,v 1.631 2008/07/08 05:21:59 dlg Exp $
+#      $OpenBSD: GENERIC,v 1.632 2008/07/20 22:17:50 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -43,7 +43,7 @@ bios0 at mainbus0
 apm0   at bios0 flags 0x0000   # flags 0x0101 to force protocol version 1.1
 acpi0  at bios?
 pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose
-ipmi0  at mainbus?             # IPMI
+ipmi0  at mainbus? disable     # IPMI
 #vmt0  at mainbus?             # VMware Tools
 esm0   at mainbus?             # Dell Embedded Server Management
 amdmsr0        at mainbus?             # MSR access for AMD Geode LX CPUs with GP