[Pkg-cups-devel] r532 - cupsys/trunk/debian

[Martin Pitt]

Author: mpitt
Date: Thu Aug  9 18:44:25 2007
New Revision: 532

Log:
* cupsys.init.d: Fix detection of parallel printers when 'lp' is already
  loaded. (https://launchpad.net/bugs/29050)

Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/cupsys.init.d

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Thu Aug  9 18:44:25 2007
@@ -8,8 +8,10 @@
   [ Martin Pitt ]
   * cupsys.init.d: Remove stray chown'ing to 'cupsys' which does not exist any
     more. (closes: #436662)
+  * cupsys.init.d: Fix detection of parallel printers when 'lp' is already
+    loaded. (https://launchpad.net/bugs/29050)
 
- -- Martin-Éric Racine <q-funk at iki.fi>  Wed, 08 Aug 2007 12:54:08 +0200
+ -- Martin-Éric Racine <q-funk at iki.fi>  Thu, 09 Aug 2007 20:11:05 +0200
 
 cupsys (1.2.12-2) unstable; urgency=low
 

Modified: cupsys/trunk/debian/cupsys.init.d
==============================================================================
--- cupsys/trunk/debian/cupsys.init.d	(original)
+++ cupsys/trunk/debian/cupsys.init.d	Thu Aug  9 18:44:25 2007
@@ -32,8 +32,7 @@
 
 	mkdir -p `dirname "$PIDFILE"`
 	if [ "$LOAD_LP_MODULE" = "yes" -a -f /usr/lib/cups/backend/parallel \
-             -a -f /proc/devices -a -f /proc/modules -a -x /sbin/modprobe \
-             -a -z "$(grep -e ' lp$' /proc/devices 2>/dev/null)" ]; then
+             -a -f /proc/devices -a -f /proc/modules -a -x /sbin/modprobe ]; then
 	  modprobe -q lp || true
 	  modprobe -q ppdev || true
 	fi