[25626] in Source-Commits
/svn/athena r25132 - trunk/debathena/config/athinfod-cluster-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Jun 13 15:24:20 2011
Date: Mon, 13 Jun 2011 15:24:13 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201106131924.p5DJOD4m026116@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-06-13 15:24:13 -0400 (Mon, 13 Jun 2011)
New Revision: 25132
Modified:
trunk/debathena/config/athinfod-cluster-config/debian/changelog
trunk/debathena/config/athinfod-cluster-config/debian/control.in
trunk/debathena/config/athinfod-cluster-config/debian/transform_athinfo.defs.debathena
Log:
In athinfod-cluster-config:
* Add support for dmesg and /var/log/messages (Trac #879)
* Use new cluster test and depend on relevant athinfod version (Trac
#906)
Modified: trunk/debathena/config/athinfod-cluster-config/debian/changelog
===================================================================
--- trunk/debathena/config/athinfod-cluster-config/debian/changelog 2011-05-23 23:50:49 UTC (rev 25131)
+++ trunk/debathena/config/athinfod-cluster-config/debian/changelog 2011-06-13 19:24:13 UTC (rev 25132)
@@ -1,3 +1,11 @@
+debathena-athinfod-cluster-config (1.2) unstable; urgency=low
+
+ * Add support for dmesg and /var/log/messages (Trac #879)
+ * Use new cluster test and depend on relevant athinfod version (Trac
+ #906)
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 13 Jun 2011 15:23:32 -0400
+
debathena-athinfod-cluster-config (1.1) unstable; urgency=low
* Add lsusb and usb-hid queries, and Python support for the latter
Modified: trunk/debathena/config/athinfod-cluster-config/debian/control.in
===================================================================
--- trunk/debathena/config/athinfod-cluster-config/debian/control.in 2011-05-23 23:50:49 UTC (rev 25131)
+++ trunk/debathena/config/athinfod-cluster-config/debian/control.in 2011-06-13 19:24:13 UTC (rev 25132)
@@ -7,7 +7,7 @@
Package: debathena-athinfod-cluster-config
Architecture: all
-Depends: debathena-athinfod, debathena-machtype, python-usb, ${misc:Depends}
+Depends: debathena-athinfod (>= 10.0.0-0debathena16~), debathena-machtype, python-usb, ${misc:Depends}
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: Athinfod configuration for Debathena
Modified: trunk/debathena/config/athinfod-cluster-config/debian/transform_athinfo.defs.debathena
===================================================================
--- trunk/debathena/config/athinfod-cluster-config/debian/transform_athinfo.defs.debathena 2011-05-23 23:50:49 UTC (rev 25131)
+++ trunk/debathena/config/athinfod-cluster-config/debian/transform_athinfo.defs.debathena 2011-06-13 19:24:13 UTC (rev 25132)
@@ -4,12 +4,14 @@
print <<EOF;
# Added by debathena-athinfod-cluster-config
-update.log machtype -v -L | grep -q "debathena-cluster" && test -r /var/log/athena-update && cat /var/log/athena-update
-update-status machtype -v -L | grep -q "debathena-cluster" && test -r /var/lib/athena-update-status && cat /var/lib/athena-update-status
+update.log /usr/lib/athinfod/is_cluster && test -r /var/log/athena-update && cat /var/log/athena-update
+update-status /usr/lib/athinfod/is_cluster && test -r /var/lib/athena-update-status && cat /var/lib/athena-update-status
in-use machtype -L | grep -q "debathena-cluster" && (test `pgrep -c larvnet-wrapper` -gt 0 && echo "yes" || echo "no") || echo "n/a"
-update-schedule machtype -v -L | grep -q "debathena-cluster" && test -r /etc/cron.d/debathena-auto-update && cat /etc/cron.d/debathena-auto-update
-install.log machtype -v -L | grep -q "debathena-cluster" && test -r /var/log/athena-install.log && cat /var/log/athena-install.log
+update-schedule /usr/lib/athinfod/is_cluster && test -r /etc/cron.d/debathena-auto-update && cat /etc/cron.d/debathena-auto-update
+install.log /usr/lib/athinfod/is_cluster && test -r /var/log/athena-install.log && cat /var/log/athena-install.log
usb-hid /usr/share/debathena-athinfod-cluster-config/usb-hid.py
-lsusb machtype -v -L | grep -q "debathena-cluster" && lsusb
+lsusb /usr/lib/athinfod/is_cluster && lsusb
+dmesg /usr/lib/athinfod/is_cluster && dmesg
+messages /usr/lib/athinfod/is_cluster && cat /var/log/messages
EOF
exit 0;
