[28218] in Source-Commits
auto-update commit: Moved update hook back to /var/run
daemon@ATHENA.MIT.EDU (Sean P. Preston)
Thu May 22 14:48:40 2014
Date: Thu, 22 May 2014 14:48:32 -0400
From: "Sean P. Preston" <wpreston@MIT.EDU>
Message-Id: <201405221848.s4MImWoM021632@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/auto-update/commit/94ec141a9cedc4941c22d7fe26ea315cc233586b
commit 94ec141a9cedc4941c22d7fe26ea315cc233586b
Author: Sean Preston <wpreston@mit.edu>
Date: Thu May 15 11:11:01 2014 -0700
Moved update hook back to /var/run
Moved update hook back to /var/run and invoked directly with sh
debian/athena-auto-update | 5 ++---
debian/changelog | 6 ++++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/debian/athena-auto-update b/debian/athena-auto-update
index 6f2e35e..1d32604 100644
--- a/debian/athena-auto-update
+++ b/debian/athena-auto-update
@@ -185,12 +185,11 @@ fi
UPDATE_HOOK_URL="https://athena10.mit.edu/update-hook/debathena-update-hook.sh"
UPDATE_HOOK_SUM="https://athena10.mit.edu/update-hook/debathena-update-hook-sha256sum"
MITCA="/usr/share/debathena-auto-update/mitCA.crt"
-UPDATE_HOOK="/var/tmp/debathena-update-hook.sh"
+UPDATE_HOOK="/var/run/debathena-update-hook.sh"
rm -f $UPDATE_HOOK
if [ "$RUN_UPDATE_HOOK" = "yes" ] && \
curl -sf -o $UPDATE_HOOK --cacert $MITCA $UPDATE_HOOK_URL; then
- chmod 500 $UPDATE_HOOK
SHA256SUM="$(curl -sf --cacert $MITCA $UPDATE_HOOK_SUM)"
rv=$?
if [ $rv != 0 ]; then
@@ -203,7 +202,7 @@ if [ "$RUN_UPDATE_HOOK" = "yes" ] && \
exit
fi
if ! [ -f "/var/lib/athena-update-hooks/$SHA256SUM" ]; then
- if ! v $UPDATE_HOOK; then
+ if ! v sh $UPDATE_HOOK; then
complain "update hook returned non-zero status"
exit
else
diff --git a/debian/changelog b/debian/changelog
index 59bbbd4..fdf0f2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debathena-auto-update (1.46) unstable; urgency=low
+
+ * Switch back to /var/run and invoke update hook via sh directly.
+
+ -- Sean Preston <wpreston@mit.edu> Thu, 15 May 2014 11:09:08 -0700
+
debathena-auto-update (1.45) unstable; urgency=low
* Do not attempt to run update hooks out of /var/run, since it's mounted
