[Pkg-cups-devel] r364 - cupsys/branches/cups-1.2/debian

[Kenshi Muto]

Author: kmuto
Date: Thu Sep 14 15:38:47 2006
New Revision: 364

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/cupsys.init.d

Log:
modify init.d (#387176)

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Thu Sep 14 15:38:47 2006
@@ -9,6 +9,8 @@
 
   [ Kenshi Muto ]
   * Apply upstream svn r5958.
+  * check modprobe command and /proc/modules dir exist before running
+    modprobe (closes: #387176).
 
  -- Kenshi Muto <kmuto at debian.org>  Fri,  8 Sep 2006 11:28:12 +0200
 

Modified: cupsys/branches/cups-1.2/debian/cupsys.init.d
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.init.d	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.init.d	Thu Sep 14 15:38:47 2006
@@ -31,7 +31,8 @@
 	chmod 3775 /usr/share/cups/model 2>/dev/null || true
 	mkdir -p `dirname "$PIDFILE"`
 	if [ "$LOAD_LP_MODULE" = "yes" -a -f /usr/lib/cups/backend/parallel \
-             -a -f /proc/devices -a -z "$(grep -e ' lp$' /proc/devices 2>/dev/null)" ]; then
+             -a -f /proc/devices -a -f /proc/modules -a -x /sbin/modprobe \
+             -a -z "$(grep -e ' lp$' /proc/devices 2>/dev/null)" ]; then
 	  modprobe -q lp || true
 	  modprobe -q ppdev || true
 	fi