If we have a tmp file that's not zero-length, we need to move it into place.

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

diff --git a/gen/cups-cluster.sh b/gen/cups-cluster.sh
index a2aa1ebb2976512b793c535675ebc6fbf8f61308..63b5e144ff1ab39f4446f03d1ec83f5ddef0ba24 100755 (executable)
--- a/gen/cups-cluster.sh
+++ b/gen/cups-cluster.sh
@@ -23,14 +23,21 @@ 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
+
 /etc/init.d/cups start
 
 /etc/cups/bin/gen-ppd.pl 2>/dev/null
+if [ -s /etc/cups/printers.conf.tmp ]; then
+    mv /etc/cups/printers.conf.tmp /etc/cups/printers.conf
+fi
 
 # if Samba-enabled, then restart it too to have it pick up
 # new definitions