From: Michael Prokop Date: Thu, 25 Sep 2008 23:22:45 +0000 (+0200) Subject: Update changelog for new upload) X-Git-Tag: 1.1.10~1 X-Git-Url: http://git.grml.org/?p=grml-scripts-core.git;a=commitdiff_plain;h=2317b08f35be9fe5a68da4d0cd893a24f3fbd93b Update changelog for new upload) --- diff --git a/debian/changelog b/debian/changelog index 0ffdf95..599dc0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -grml-scripts (1.1.10) UNRELEASED; urgency=low +grml-scripts (1.1.10) unstable; urgency=low * added grml-chroot including manpage * added xsltproc, docbook-xsl, asciidoc to build dependencies diff --git a/usr_sbin/blacklist b/usr_sbin/blacklist index f17447f..12c61d8 100755 --- a/usr_sbin/blacklist +++ b/usr_sbin/blacklist @@ -4,7 +4,7 @@ # 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: Fre Aug 04 11:41:22 CEST 2006 [mika] +# Latest change: Thu Aug 07 17:16:23 CEST 2008 [mika] ################################################################################ PN="$(basename $0)" @@ -25,7 +25,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"