From: zacheiss <zacheiss>
Date: Fri, 16 Oct 2009 20:37:18 +0000 (+0000)
Subject: Goo for persistently disabling queues.
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/7c2b6e57a03d9b61916dfcdf4b82c3a63ef7ab33

Goo for persistently disabling queues.
---

diff --git a/gen/cups-print.sh b/gen/cups-print.sh
index c60a2a8c..1e3c42f4 100755
--- a/gen/cups-print.sh
+++ b/gen/cups-print.sh
@@ -21,15 +21,23 @@ CUPSLOCAL=/etc/cups
 test -r $TARFILE || exit $MR_MISSINGFILE
 test -d $CUPSLOCAL || exit $MR_MISSINGFILE
 
+/etc/cups/bin/check-disabled.pl 2>/dev/null
+
 # Unpack the tar file, getting only files that are newer than the
 # on-disk copies (-u).
 cd /
 tar xf $TARFILE || exit $MR_TARERR
 
+/etc/cups/bin/post-dcm-disable.pl 2>/dev/null
+if [ -s /etc/cups/printers.conf.tmp ]; then
+    mv /etc/cups/printers.conf.tmp /etc/cups/printers.conf
+fi
+
 # Now, make a stab at the PPD file.
 /etc/cups/bin/gen-ppd.pl
 
-/etc/init.d/cups restart
+/etc/init.d/cups stop
+/etc/init.d/cups start
 
 if [ $? != 0 ]; then
     exit $MR_MKCRED