[25777] in Source-Commits
/svn/athena r25225 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Jul 11 17:25:07 2011
Date: Mon, 11 Jul 2011 17:25:01 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107112125.p6BLP11W032256@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-11 17:25:00 -0400 (Mon, 11 Jul 2011)
New Revision: 25225
Modified:
trunk/debathena/config/reactivate/debian/reactivate
trunk/debathena/config/reactivate/debian/snapshot-run
Log:
Move comments in snapshot-run, and also clean up in reactivate
Modified: trunk/debathena/config/reactivate/debian/reactivate
===================================================================
--- trunk/debathena/config/reactivate/debian/reactivate 2011-07-11 20:57:20 UTC (rev 25224)
+++ trunk/debathena/config/reactivate/debian/reactivate 2011-07-11 21:25:00 UTC (rev 25225)
@@ -31,6 +31,12 @@
fi
fi
+# Cleanup our ticketenv hack
+# Make sure nobody was evil
+chattr -i /tmp/ticketenv
+# If you made a directory and stored files there, too bad
+rm -rf /tmp/ticketenv
+
# If either we or an updated package wanted to reboot, now is a
# perfectly good time to do so -- auto-update is inhibited during a
# login session.
Modified: trunk/debathena/config/reactivate/debian/snapshot-run
===================================================================
--- trunk/debathena/config/reactivate/debian/snapshot-run 2011-07-11 20:57:20 UTC (rev 25224)
+++ trunk/debathena/config/reactivate/debian/snapshot-run 2011-07-11 21:25:00 UTC (rev 25225)
@@ -48,18 +48,23 @@
# /after/ being chrooted, which puts users back in the groups we
# added them to
+# Workaround for stupidity, see #928 for details
+# Remove this once we're running pam-afs-session 2.4
+# Run this inside the "set -e" block so it'll fail if necessary
echo "KRB5CCNAME=$KRB5CCNAME" >| /tmp/ticketenv
set +e
cd
-# Workaround for stupidity, see #928 for details
-# Remove this once we're running pam-afs-session 2.4
schroot -c "$session" -r -p -- sudo -E -u "$USER" -- "$@"
cd /
# Teardown
+# Remove file from above.
+# (This also gets nuked in reactivate, but be paranoid)
+rm -f /tmp/ticketenv
+
for daemon in $daemons; do
schr invoke-rc.d "$daemon" stop || [ $? = 100 ]
done
