[25527] in Source-Commits
/svn/athena r25057 - trunk/athena/etc/athinfod/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Mar 16 19:30:50 2011
Date: Wed, 16 Mar 2011 19:30:45 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103162330.p2GNUjWq016944@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-03-16 19:30:44 -0400 (Wed, 16 Mar 2011)
New Revision: 25057
Added:
trunk/athena/etc/athinfod/debian/is_cluster
Modified:
trunk/athena/etc/athinfod/debian/changelog
trunk/athena/etc/athinfod/debian/debathena-athinfod.install
Log:
In athinfod:
* Add simple cluster test that will check Hesiod first (Trac #742)
Modified: trunk/athena/etc/athinfod/debian/changelog
===================================================================
--- trunk/athena/etc/athinfod/debian/changelog 2011-03-16 22:14:13 UTC (rev 25056)
+++ trunk/athena/etc/athinfod/debian/changelog 2011-03-16 23:30:44 UTC (rev 25057)
@@ -1,3 +1,9 @@
+debathena-athinfod (10.0.0-0debathena16) unstable; urgency=low
+
+ * Add simple cluster test that will check Hesiod first (Trac #742)
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 16 Mar 2011 19:27:11 -0400
+
debathena-athinfod (10.0.0-0debathena15) unstable; urgency=low
* Move cluster-specific queries to athinfod-cluster-config (Trac #693)
Modified: trunk/athena/etc/athinfod/debian/debathena-athinfod.install
===================================================================
--- trunk/athena/etc/athinfod/debian/debathena-athinfod.install 2011-03-16 22:14:13 UTC (rev 25056)
+++ trunk/athena/etc/athinfod/debian/debathena-athinfod.install 2011-03-16 23:30:44 UTC (rev 25057)
@@ -1,2 +1,3 @@
debian/athinfo.access /etc/athena
debian/athinfo.defs /etc/athena
+debian/is_cluster usr/lib/athinfo
Added: trunk/athena/etc/athinfod/debian/is_cluster
===================================================================
--- trunk/athena/etc/athinfod/debian/is_cluster (rev 0)
+++ trunk/athena/etc/athinfod/debian/is_cluster 2011-03-16 23:30:44 UTC (rev 25057)
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# Determine whether this is a cluster machine or not by
+# exiting with 0 or 1, respectively
+
+CLUSTER=
+eval "$(getcluster -b $(lsb_release -sr))"
+
+if [ "$CLUSTER" = "cluster" ]; then
+ # Hesiod takes priority
+ exit 0
+elif machtype -vL | grep -q debathena-cluster; then
+ exit 0
+fi
+exit 1
Property changes on: trunk/athena/etc/athinfod/debian/is_cluster
___________________________________________________________________
Added: svn:executable
+ *
