[23482] in Source-Commits
/svn/athena r23128 - trunk/debathena/debathena/larvnet/debian
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Thu Aug 7 15:00:36 2008
Date: Thu, 7 Aug 2008 15:00:06 -0400 (EDT)
From: ghudson@MIT.EDU
Message-Id: <200808071900.PAA18984@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-08-07 15:00:05 -0400 (Thu, 07 Aug 2008)
New Revision: 23128
Modified:
trunk/debathena/debathena/larvnet/debian/busyd
trunk/debathena/debathena/larvnet/debian/changelog
trunk/debathena/debathena/larvnet/debian/debathena-larvnet.postinst
Log:
In larvnet:
* Use a better test for the workstation's busy state.
* Run busyd as nobody.
Modified: trunk/debathena/debathena/larvnet/debian/busyd
===================================================================
--- trunk/debathena/debathena/larvnet/debian/busyd 2008-08-07 04:46:04 UTC (rev 23127)
+++ trunk/debathena/debathena/larvnet/debian/busyd 2008-08-07 19:00:05 UTC (rev 23128)
@@ -2,11 +2,9 @@
use strict;
-# Determine if the machine is busy. Unfortunately, this test only
-# works for root. Perhaps there is a better one which would allow
-# this daemon to run as nobody.
-my @result = glob("/var/lib/gdm/*.Xservers");
-my $busy = (scalar @result > 0) ? 1 : 0;
+# Determine if the machine is busy.
+my $result = `pgrep -c larvnet-wrapper`;
+my $busy = ($result > 0) ? 1 : 0;
# Collect some basic information about the machine.
my $hostname = `hostname --fqdn`;
Modified: trunk/debathena/debathena/larvnet/debian/changelog
===================================================================
--- trunk/debathena/debathena/larvnet/debian/changelog 2008-08-07 04:46:04 UTC (rev 23127)
+++ trunk/debathena/debathena/larvnet/debian/changelog 2008-08-07 19:00:05 UTC (rev 23128)
@@ -1,3 +1,10 @@
+debathena-larvnet (10.0.0-0debathena2) unstable; urgency=low
+
+ * Use a better test for the workstation's busy state.
+ * Run busyd as nobody.
+
+ -- Greg Hudson <ghudson@mit.edu> Thu, 07 Aug 2008 14:56:02 -0400
+
debathena-larvnet (10.0.0-0debathena1) unstable; urgency=low
* Initial release.
Modified: trunk/debathena/debathena/larvnet/debian/debathena-larvnet.postinst
===================================================================
--- trunk/debathena/debathena/larvnet/debian/debathena-larvnet.postinst 2008-08-07 04:46:04 UTC (rev 23127)
+++ trunk/debathena/debathena/larvnet/debian/debathena-larvnet.postinst 2008-08-07 19:00:05 UTC (rev 23128)
@@ -25,7 +25,7 @@
busypoll 49154/udp # busy polling port for ws
EOF
fi
- update-inetd --group INFO --add "busypoll\tdgram\tudp\twait\troot\t/usr/sbin/busyd\tbusyd"
+ update-inetd --group INFO --add "busypoll\tdgram\tudp\twait\tnobody\t/usr/sbin/busyd\tbusyd"
;;
abort-upgrade|abort-remove|abort-deconfigure)
