[25631] in Source-Commits
/svn/athena r25137 - trunk/debathena/config/athinfod-cluster-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Jun 14 16:33:33 2011
Date: Tue, 14 Jun 2011 16:33:27 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201106142033.p5EKXRO3024446@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-06-14 16:33:26 -0400 (Tue, 14 Jun 2011)
New Revision: 25137
Modified:
trunk/debathena/config/athinfod-cluster-config/debian/changelog
trunk/debathena/config/athinfod-cluster-config/debian/transform_athinfo.defs.debathena
Log:
In athinfod-cluster-config:
* Read the correct files in update-schedule (Trac #910)
* Remove 'test -r' (Trac #909)
Modified: trunk/debathena/config/athinfod-cluster-config/debian/changelog
===================================================================
--- trunk/debathena/config/athinfod-cluster-config/debian/changelog 2011-06-14 20:07:16 UTC (rev 25136)
+++ trunk/debathena/config/athinfod-cluster-config/debian/changelog 2011-06-14 20:33:26 UTC (rev 25137)
@@ -3,8 +3,10 @@
* Add support for dmesg and /var/log/messages (Trac #879)
* Use new cluster test and depend on relevant athinfod version (Trac
#906)
+ * Read the correct files in update-schedule (Trac #910)
+ * Remove 'test -r' (Trac #909)
- -- Jonathan Reed <jdreed@mit.edu> Mon, 13 Jun 2011 15:23:32 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 14 Jun 2011 16:31:08 -0400
debathena-athinfod-cluster-config (1.1) unstable; urgency=low
Modified: trunk/debathena/config/athinfod-cluster-config/debian/transform_athinfo.defs.debathena
===================================================================
--- trunk/debathena/config/athinfod-cluster-config/debian/transform_athinfo.defs.debathena 2011-06-14 20:07:16 UTC (rev 25136)
+++ trunk/debathena/config/athinfod-cluster-config/debian/transform_athinfo.defs.debathena 2011-06-14 20:33:26 UTC (rev 25137)
@@ -4,11 +4,11 @@
print <<EOF;
# Added by debathena-athinfod-cluster-config
-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 /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
+update.log /usr/lib/athinfod/is_cluster && cat /var/log/athena-update
+update-status /usr/lib/athinfod/is_cluster && cat /var/lib/athena-update-status
+in-use /usr/lib/athinfod/is_cluster && (test `pgrep -c larvnet-wrapper` -gt 0 && echo "yes" || echo "no") || echo "n/a"
+update-schedule /usr/lib/athinfod/is_cluster && cat /etc/cron.d/athena-auto-update /etc/cron.d/athena-auto-upgrade
+install.log /usr/lib/athinfod/is_cluster && cat /var/log/athena-install.log
usb-hid /usr/share/debathena-athinfod-cluster-config/usb-hid.py
lsusb /usr/lib/athinfod/is_cluster && lsusb
dmesg /usr/lib/athinfod/is_cluster && dmesg
