[24035] in Source-Commits
/svn/athena r23644 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Robert A Basch)
Tue Mar 24 17:35:07 2009
Date: Tue, 24 Mar 2009 17:35:02 -0400
From: Robert A Basch <rbasch@MIT.EDU>
Message-Id: <200903242135.n2OLZ2Mg002147@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: rbasch
Date: 2009-03-24 17:35:01 -0400 (Tue, 24 Mar 2009)
New Revision: 23644
Modified:
trunk/debathena/config/reactivate/debian/athena-login-snapshot
trunk/debathena/config/reactivate/debian/changelog
Log:
In reactivate:
* Send SIGTERM before SIGKILL when cleaning up user processes
using the bind mounts, to give them a chance to exit cleanly.
Modified: trunk/debathena/config/reactivate/debian/athena-login-snapshot
===================================================================
--- trunk/debathena/config/reactivate/debian/athena-login-snapshot 2009-03-23 16:07:17 UTC (rev 23643)
+++ trunk/debathena/config/reactivate/debian/athena-login-snapshot 2009-03-24 21:35:01 UTC (rev 23644)
@@ -147,8 +147,14 @@
done
# Clean up any remaining user processes using the bind mounts.
+ # Try sending SIGTERM first to give processes a chance to exit
+ # cleanly.
if [ -n "$USER" -a "$USER" != root ]; then
for dir in $binddirs; do
+ v su -s /bin/sh "$USER" -c "fuser -kmv -TERM /login$dir" || true
+ done
+ sleep 3
+ for dir in $binddirs; do
v su -s /bin/sh "$USER" -c "fuser -kmv /login$dir" || true
done
fi
Modified: trunk/debathena/config/reactivate/debian/changelog
===================================================================
--- trunk/debathena/config/reactivate/debian/changelog 2009-03-23 16:07:17 UTC (rev 23643)
+++ trunk/debathena/config/reactivate/debian/changelog 2009-03-24 21:35:01 UTC (rev 23644)
@@ -1,3 +1,10 @@
+debathena-reactivate (1.18) unstable; urgency=low
+
+ * Send SIGTERM before SIGKILL when cleaning up user processes
+ using the bind mounts, to give them a chance to exit cleanly.
+
+ -- Robert Basch <rbasch@mit.edu> Tue, 24 Mar 2009 17:24:07 -0400
+
debathena-reactivate (1.17) unstable; urgency=low
* Even more verbosity! Use fuser -kmv to get more output about the
