[25868] in Source-Commits
Re: /svn/athena r25268 r25269 -
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Thu Jul 21 14:34:45 2011
Date: Thu, 21 Jul 2011 14:34:37 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <07E9600F-3DA4-4B46-871B-0EFABA7442EC@mit.edu>
Message-ID: <alpine.GSO.1.10.1107211431190.7526@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK r25268, r25269 but you need to bump the version.
I "love" that we need to have the extra check that CUPS is running (from
25268); as Geoffrey mentiond in re: r25265 (source-commits[25857]), this
check is fragile.
I think I'll file a ticket that checking for CUPS actually running sucks,
and try to enumerate the places we're doing so.
-Ben
On Wed, 20 Jul 2011, Jonathan Reed wrote:
> I don't love this method, but it's for bounded time (between now and Sept).
>
> -Jon
>
> On Jul 20, 2011, at 5:59 PM, Jonathan D Reed wrote:
>
>> Author: jdreed
>> Date: 2011-07-20 17:59:40 -0400 (Wed, 20 Jul 2011)
>> New Revision: 25269
>>
>> Modified:
>> trunk/debathena/config/cluster-cups-config/debian/debathena-cluster-cups-config.init
>> Log:
>> Abuse /var/run/athena-nologin to indicate that we're busy
>>
>> 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 21:50:47 UTC (rev 25268)
>> +++ trunk/debathena/config/cluster-cups-config/debian/debathena-cluster-cups-config.init 2011-07-20 21:59:40 UTC (rev 25269)
>> @@ -17,14 +17,18 @@
>> start)
>> if [ -f /var/lib/debathena-cluster-cups-config-reconfigure_required ]; then
>> log_action_msg "Adding cluster printers"
>> - touch /var/run/debathena-adding-printers
>> + nologin=0
>> + if [ ! -f /var/run/athena-nologin ]; then
>> + touch /var/run/athena-nologin
>> + nologin=1
>> + fi
>> 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
>> fi
>> - rm /var/run/debathena-adding-printers
>> + [ $nologin -eq 1 ] && rm /var/run/athena-nologin
>> fi
>> ;;
>> stop|restart|reload|force-reload|status)
>>
>
>
