Make sure disabled queues stay disabled.

[moira.git] / gen / cups-cluster.sh

diff --git a/gen/cups-cluster.sh b/gen/cups-cluster.sh
index 0dae72bbed69e757855dad10266f085662a78c9f..927281e8e70d4f62936e0c3a9b9259201880712e 100755 (executable)
--- a/gen/cups-cluster.sh
+++ b/gen/cups-cluster.sh
@@ -17,21 +17,25 @@ PATH=/bin
 TARFILE=/var/tmp/cups-cluster.out
 CUPSLOCAL=/etc/cups
 
+/etc/init.d/cups stop
+
 # Alert if the tar file or other needed files do not exist
 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/sync_lpd_ldap.pl 2>/dev/null
-/etc/cups/bin/gen-ppd.pl 2>/dev/null
+/etc/cups/bin/post-dcm-disable.pl 2>/dev/null
 
-/etc/init.d/cups stop
 /etc/init.d/cups start
 
+/etc/cups/bin/gen-ppd.pl 2>/dev/null
+
 # if Samba-enabled, then restart it too to have it pick up
 # new definitions
 if [ -x /etc/init.d/smb ]; then