[Pkg-cups-devel] r297 - in cupsys/branches/cups-1.2/debian: .

[Kenshi Muto]

Author: kmuto
Date: Wed Jul 19 03:27:00 2006
New Revision: 297

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/cupsys.default
   cupsys/branches/cups-1.2/debian/cupsys.init.d
   cupsys/branches/cups-1.2/debian/patches/00list

Log:
removed modprobe from parallel backend. added loading code to init script (will discover take care lp module in the future?).

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Wed Jul 19 03:27:00 2006
@@ -21,6 +21,11 @@
     for your environment. (closes: #376840)
   * Split locale files to new package "cupsys-common". (closes: #378659)
     This package is used by cupsys and cupsys-client/cupsys-bsd.
+  * removed 26_modprobe: because parallel backend executes with user 'lp'
+    permission, modprobe can't work. We CUPS team believe it's better 
+    that lp module is loaded by discover or any other hardware detection
+    programs instead of CUPS. We provide a module loader by init script
+    for user's convenience at this time.
 
  -- Kenshi Muto <kmuto at debian.org>  Wed, 21 Jun 2006 15:06:02 +0000
 

Modified: cupsys/branches/cups-1.2/debian/cupsys.default
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.default	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.default	Wed Jul 19 03:27:00 2006
@@ -1 +1,4 @@
 # Cups configure options
+
+# LOAD_LP_MODULE: enable/disable to load "lp" parallel printer driver module
+LOAD_LP_MODULE=yes

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	Wed Jul 19 03:27:00 2006
@@ -12,6 +12,10 @@
 
 set -e
 
+if [ -r /etc/default/cupsys ]; then
+  . /etc/default/cupsys
+fi
+
 . /lib/lsb/init-functions
 
 # Get the timezone set.
@@ -26,6 +30,11 @@
 	chown root:lpadmin /usr/share/cups/model 2>/dev/null || true
 	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
+	    modprobe -q lp || true
+          fi
+	fi
 	start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" --exec $DAEMON
 	log_end_msg $?
 	;;

Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2/debian/patches/00list	Wed Jul 19 03:27:00 2006
@@ -13,7 +13,7 @@
 12_quiesce_ipp_logging.dpatch
 13_default_log_warn.dpatch
 19_cupsaccept.dpatch
-26_modprobe.dpatch
+#26_modprobe.dpatch
 44_fixconfdirperms.dpatch
 47_pid.dpatch
 #48_stdlib.dpatch