Drop grml-postfix

[grml-scripts.git] / usr_sbin / blacklist

diff --git a/usr_sbin/blacklist b/usr_sbin/blacklist
index f17447f..ff9f2d0 100755 (executable)
--- a/usr_sbin/blacklist
+++ b/usr_sbin/blacklist
@@ -4,11 +4,10 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Fre Aug 04 11:41:22 CEST 2006 [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
@@ -17,7 +16,7 @@ if [ -z "$1" ] ; then
   exit 1
 fi
 
-if [ $UID != 0 ] ; then
+if [ "$(id -ru)" != "0" ] ; then
    echo Error: become root before starting $0 >& 2
    exit 100
 fi
@@ -25,7 +24,7 @@ fi
 [ -f "$MODPROBEFILE" ] || touch "$MODPROBEFILE"
 
 if [ "$PN" = 'blacklist' ] ; then
-  if grep -q "^blacklist $1" $MODPROBEFILE ; then
+  if grep -q "^blacklist $1\$" $MODPROBEFILE ; then
      eerror "Module $1 already on blacklist in $MODPROBEFILE" ; eend 1
   else
     einfo "Adding module $1 to blacklist $MODPROBEFILE"