From 2f63cad2a66b764da450f81151203f1ce37136d2 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 3 Mar 2009 10:37:09 +0100 Subject: [PATCH] blacklist: use /etc/modprobe.d/grml.conf --- debian/changelog | 5 ++++- usr_sbin/blacklist | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7ab37ff..ba8a04d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ grml-scripts (1.1.18) UNRELEASED; urgency=low * Add lzop to Depends. [Closes: issue613] + * blacklist: use /etc/modprobe.d/grml.conf instead of + /etc/modprobe.d/grml. New module-init-tools will + use only files using the .conf suffix. - -- Michael Prokop Thu, 12 Feb 2009 21:04:59 +0100 + -- Michael Prokop Tue, 03 Mar 2009 10:35:12 +0100 grml-scripts (1.1.17) unstable; urgency=low diff --git a/usr_sbin/blacklist b/usr_sbin/blacklist index 12c61d8..ff1189a 100755 --- a/usr_sbin/blacklist +++ b/usr_sbin/blacklist @@ -4,11 +4,10 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Thu Aug 07 17:16:23 CEST 2008 [mika] ################################################################################ PN="$(basename $0)" -[ -n "$MODPROBEFILE" ] || MODPROBEFILE=/etc/modprobe.d/grml +[ -n "$MODPROBEFILE" ] || MODPROBEFILE=/etc/modprobe.d/grml.conf [ -r /etc/grml/lsb-functions ] && . /etc/grml/lsb-functions if [ -z "$1" ] ; then -- 2.1.4