From: Michael Prokop <mika@grml.org>
Date: Wed, 25 Jul 2007 13:21:27 +0000 (+0200)
Subject: Support bootoption nogrmlacpi, inform user how to skip acpi stuff
X-Git-Tag: 0.7.9
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=b005ba88d5cc0a48a6677755ccc8653ca590ee9a

Support bootoption nogrmlacpi, inform user how to skip acpi stuff
---

diff --git a/autoconfig.functions b/autoconfig.functions
index f40d45c..3956408 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -716,9 +716,11 @@ fi
 config_acpi_apm(){
 if [ -d /proc/acpi ]; then
   if checkbootparam "noacpi"; then
-    ewarn "Skipping ACPI Bios detection as requested on boot commandline." ; eend 0
+    ewarn "Skipping ACPI Bios detection as requested via noacpi on boot commandline." ; eend 0
+  elif checkbootparam "nogrmlacpi" ; then
+    ewarn "Skipping ACPI Bios detection as requested via nogrmlacpi on boot commandline." ; eend 0
   else
-    einfo "ACPI Bios found, activating modules: "
+    einfo "ACPI Bios found, activating modules (disable via bootoption noacpi / nogrmlacpi): "
     eindent
     found=""
     for a in /lib/modules/$KERNEL/kernel/drivers/acpi/*; do
diff --git a/debian/changelog b/debian/changelog
index 96e439e..4a2e6d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-autoconfig (0.7.9) unstable; urgency=low
+
+  * Support bootoption nogrmlacpi to disable acpi stuff inside
+    grml-autoconfig without having to boot using noacpi (which
+    triggers kernel code actions).
+  * Inform user how to skip the acpi stuff.
+
+ -- Michael Prokop <mika@grml.org>  Wed, 25 Jul 2007 15:20:14 +0200
+
 grml-autoconfig (0.7.8) unstable; urgency=low
 
   * Inform users about CONFIG_DHCP=no when running from harddisk.