[25396] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r24951 - trunk/athena/etc/athinfod/debian

daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Feb 14 12:46:21 2011

Date: Mon, 14 Feb 2011 12:46:14 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201102141746.p1EHkEHh016766@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: jdreed
Date: 2011-02-14 12:46:14 -0500 (Mon, 14 Feb 2011)
New Revision: 24951

Modified:
   trunk/athena/etc/athinfod/debian/athinfo.defs
   trunk/athena/etc/athinfod/debian/changelog
Log:
In athinfod:
  * Move cluster-specific queries to athinfod-cluster-config (Trac #693)


Modified: trunk/athena/etc/athinfod/debian/athinfo.defs
===================================================================
--- trunk/athena/etc/athinfod/debian/athinfo.defs	2011-02-14 17:41:21 UTC (rev 24950)
+++ trunk/athena/etc/athinfod/debian/athinfo.defs	2011-02-14 17:46:14 UTC (rev 24951)
@@ -18,9 +18,6 @@
 version		echo `machtype -L` on `machtype -E`
 clusterinfo	test -r /var/run/athena-clusterinfo.csh && cat /var/run/athena-clusterinfo.csh
 clusterinfo.bsh	test -r /var/run/athena-clusterinfo.sh && cat /var/run/athena-clusterinfo.sh
-update.log	machtype -v -L | grep -q "debathena-cluster" && test -r /var/log/athena-update && cat /var/log/athena-update
-athena-install.log	machtype -v -L | grep -q "debathena-cluster" && test -r /var/log/athena-install.log && cat /var/log/athena-install.log
-reactivate.log	machtype -v -L | grep -q "debathena-cluster" && test -r /var/log/athena-reactivate && cat /var/log/athena-reactivate
 date		date
 uptime		uptime
 partitions	cat /proc/partitions
@@ -32,7 +29,6 @@
 cpuspeed	grep MHz /proc/cpuinfo
 packages	dpkg-query -W -f '${Package}\t${Version}\t${Status}\n' | sed -n 's/\tinstall ok installed$//p'
 modules  	lsmod
-update-status	machtype -v -L | grep -q "debathena-cluster" && test -r /var/lib/athena-update-status && cat /var/lib/athena-update-status
 policy		apt-cache policy
 hardware	cat /sys/class/dmi/id/product_name /sys/class/dmi/id/product_version
-in-use		machtype -L | grep -q "debathena-cluster" && (test `pgrep -c larvnet-wrapper` -gt 0 && echo "yes" || echo "no") || echo "n/a"
+

Modified: trunk/athena/etc/athinfod/debian/changelog
===================================================================
--- trunk/athena/etc/athinfod/debian/changelog	2011-02-14 17:41:21 UTC (rev 24950)
+++ trunk/athena/etc/athinfod/debian/changelog	2011-02-14 17:46:14 UTC (rev 24951)
@@ -1,3 +1,9 @@
+debathena-athinfod (10.0.0-0debathena15) unstable; urgency=low
+
+  * Move cluster-specific queries to athinfod-cluster-config (Trac #693)
+
+ -- Jonathan Reed <jdreed@mit.edu>  Mon, 14 Feb 2011 12:46:01 -0500
+
 debathena-athinfod (10.0.0-0debathena14) unstable; urgency=low
 
   * Add back the athena-install.log query.


home help back first fref pref prev next nref lref last post