[25537] in Source-Commits
/svn/athena r25067 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Mar 22 11:12:15 2011
Date: Tue, 22 Mar 2011 11:12:08 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103221512.p2MFC8sM015716@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-03-22 11:12:08 -0400 (Tue, 22 Mar 2011)
New Revision: 25067
Modified:
trunk/debathena/config/auto-update/debian/changelog
trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst
Log:
In auto-update:
* cron.d files don't inherit crontab's path, so set one
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2011-03-18 15:02:40 UTC (rev 25066)
+++ trunk/debathena/config/auto-update/debian/changelog 2011-03-22 15:12:08 UTC (rev 25067)
@@ -1,3 +1,9 @@
+debathena-auto-update (1.23.1) unstable; urgency=low
+
+ * cron.d files don't inherit crontab's path, so set one
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 22 Mar 2011 11:11:59 -0400
+
debathena-auto-update (1.23) unstable; urgency=low
* Upgrade attempts now happen up to 3 times per night (Trac #694)
Modified: trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst
===================================================================
--- trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst 2011-03-18 15:02:40 UTC (rev 25066)
+++ trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst 2011-03-22 15:12:08 UTC (rev 25067)
@@ -75,6 +75,9 @@
rm -f $UPG_CRONFILE
echo "# Automatically generated by debathena-auto-update postinst" > $UPD_CRONFILE
+ echo "SHELL=/bin/sh" > $UPD_CRONFILE
+ echo "PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" > $UPD_CRONFILE
+
for h in 2 4 6; do
desync2cron $h 120 root /usr/sbin/athena-auto-update cron >> $UPD_CRONFILE
done
@@ -82,6 +85,8 @@
desync2cron $h 360 root /usr/sbin/athena-auto-update cron >> $UPD_CRONFILE
done
echo "# Automatically generated by debathena-auto-update postinst" > $UPG_CRONFILE
+ echo "SHELL=/bin/sh" > $UPG_CRONFILE
+ echo "PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" > $UPG_CRONFILE
upginterval=360
hostname=`hostname | tr 'A-Z' 'a-z'`
