[23515] in Source-Commits
/svn/athena r23159 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Tue Aug 26 12:41:11 2008
Date: Tue, 26 Aug 2008 12:40:38 -0400 (EDT)
From: ghudson@MIT.EDU
Message-Id: <200808261640.MAA02689@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-08-26 12:40:36 -0400 (Tue, 26 Aug 2008)
New Revision: 23159
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-update
trunk/debathena/config/auto-update/debian/changelog
Log:
In auto-update:
* Allow hesiod cluster info to repoint debathena apt repository.
Modified: trunk/debathena/config/auto-update/debian/athena-auto-update
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-update 2008-08-24 18:28:56 UTC (rev 23158)
+++ trunk/debathena/config/auto-update/debian/athena-auto-update 2008-08-26 16:40:36 UTC (rev 23159)
@@ -47,6 +47,16 @@
# Punt output while we figure out if there are updates to take.
exec >/dev/null 2>&1
+# Allow hesiod cluster info to specify the debathena apt repository.
+# (Will do nothing if debathena-clusterinfo isn't installed.)
+[ -x /usr/sbin/save-cluster-info ] && /usr/sbin/save-cluster-info
+cinfo=/var/run/athena-clusterinfo.sh
+slist=/etc/apt/sources.list.d/debathena.list
+if [ -r $cinfo -a -w $slist ]; then
+ (. $cinfo;
+ [ -n "$APT" ] && perl -pi.old -e 's|http://\S+|$ENV{"APT"}|e;' $slist)
+fi
+
# Update the aptitude cache.
if ! aptitude update; then
complain "aptitude update failed"
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2008-08-24 18:28:56 UTC (rev 23158)
+++ trunk/debathena/config/auto-update/debian/changelog 2008-08-26 16:40:36 UTC (rev 23159)
@@ -1,3 +1,9 @@
+debathena-auto-update (1.3) unstable; urgency=low
+
+ * Allow hesiod cluster info to repoint debathena apt repository.
+
+ -- Greg Hudson <ghudson@mit.edu> Tue, 26 Aug 2008 12:39:30 -0400
+
debathena-auto-update (1.2) unstable; urgency=low
* Tie into reactivate's new login chroots (when installed).
