From: Michael Prokop <mika@grml.org>
Date: Mon, 14 Jan 2008 20:35:23 +0000 (+0100)
Subject: Support multiple modules in bootoption blacklist
X-Git-Tag: 0.8.1
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=0ef13567e419e2ed045200a313d4d23ba8e13332;hp=115378b0122708e2e943079d04bc0c0e81a5c8fb;ds=sidebyside

Support multiple modules in bootoption blacklist
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 42c80f2..5442b8c 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Don Dez 27 23:58:27 CET 2007 [mika]
+# Latest change: Mon Jän 14 21:34:16 CET 2008 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -708,18 +708,20 @@ if checkbootparam "blacklist" ; then
   einfo "Bootoption blacklist found."
   BLACK="$(getbootparam 'blacklist' 2>>$DEBUG)"
   if [ -n "$BLACK" ] ; then
-    einfo "Blacklisting module ${BLACK} via /etc/modprobe.d/grml."
-    echo "# begin entry generated by config_blacklist of grml-autoconfig" >> /etc/modprobe.d/grml
-    echo "blacklist $BLACK"     >> /etc/modprobe.d/grml
-    echo "alias     $BLACK off" >> /etc/modprobe.d/grml
-    echo "# end   entry generated by config_blacklist of grml-autoconfig" >> /etc/modprobe.d/grml ; eend $?
+    for module in $(echo ${BLACK//,/ }) ; do
+        einfo "Blacklisting module ${module} via /etc/modprobe.d/grml."
+        echo "# begin entry generated by config_blacklist of grml-autoconfig" >> /etc/modprobe.d/grml
+        echo "blacklist $module"     >> /etc/modprobe.d/grml
+        echo "alias     $module off" >> /etc/modprobe.d/grml
+        echo "# end   entry generated by config_blacklist of grml-autoconfig" >> /etc/modprobe.d/grml ; eend $?
+    done
   else
    eerror "No given module for blacklist found. Blacklisting will not work therefore."
   fi
  else
-  ewarn "Backlisting via bootoption does not work on harddisk installations." ; eend 1
+  ewarn "Backlisting via bootoption is not intended for use on harddisk installations." ; eend 1
   eindent
-   einfo "Please blacklist the module(s) via /etc/modprobe.d/blacklist."
+   einfo "Please blacklist the module(s) manually using the 'blacklist' script."
   eoutdent
  fi
 fi
diff --git a/debian/changelog b/debian/changelog
index 75360f9..2108cc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.8.1) unstable; urgency=low
+
+  * Support multiple modules in bootoption blacklist.
+    [Closes: issue321]
+
+ -- Michael Prokop <mika@grml.org>  Mon, 14 Jan 2008 21:34:35 +0100
+
 grml-autoconfig (0.8.0) unstable; urgency=low
 
   * Support /etc/X11/xorg.conf.virtualbox in config_vmware()