[25852] in Source-Commits
/svn/athena r25263 - trunk/debathena/config/cluster-cups-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jul 20 14:21:35 2011
Date: Wed, 20 Jul 2011 14:21:24 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107201821.p6KILOUw029197@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-20 14:21:24 -0400 (Wed, 20 Jul 2011)
New Revision: 25263
Modified:
trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers
trunk/debathena/config/cluster-cups-config/debian/debathena-cluster-cups-config.init
Log:
Ensure the init script only runs once
Modified: trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers
===================================================================
--- trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers 2011-07-20 18:19:53 UTC (rev 25262)
+++ trunk/debathena/config/cluster-cups-config/debian/configure-athena-printers 2011-07-20 18:21:24 UTC (rev 25263)
@@ -69,7 +69,7 @@
del_printers
;;
*)
- echo "Usage: $0 [ add | remove | verify ]"
+ echo "Usage: $0 [ add | remove ]"
exit 1
;;
esac
Modified: trunk/debathena/config/cluster-cups-config/debian/debathena-cluster-cups-config.init
===================================================================
--- trunk/debathena/config/cluster-cups-config/debian/debathena-cluster-cups-config.init 2011-07-20 18:19:53 UTC (rev 25262)
+++ trunk/debathena/config/cluster-cups-config/debian/debathena-cluster-cups-config.init 2011-07-20 18:21:24 UTC (rev 25263)
@@ -18,6 +18,7 @@
if [ -f /var/lib/debathena-cluster-cups-config-reconfigure_required ]; then
log_action_msg "Adding cluster printers"
if /usr/share/debathena-cluster-cups-config/configure-athena-printers add; then
+ rm -f /var/lib/debathena-cluster-cups-config-reconfigure_required
log_end_msg 0
else
log_end_msg 1