[25841] in Source-Commits
/svn/athena r25258 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Tue Jul 19 17:58:16 2011
Date: Tue, 19 Jul 2011 17:58:09 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201107192158.p6JLw9la010842@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2011-07-19 17:58:09 -0400 (Tue, 19 Jul 2011)
New Revision: 25258
Modified:
trunk/debathena/config/reactivate/debian/changelog
trunk/debathena/config/reactivate/debian/reactivate
Log:
In reactivate:
* If chattr fails due to the file not existing, that shouldn't abort
the rest of reactivate.
Modified: trunk/debathena/config/reactivate/debian/changelog
===================================================================
--- trunk/debathena/config/reactivate/debian/changelog 2011-07-19 21:18:04 UTC (rev 25257)
+++ trunk/debathena/config/reactivate/debian/changelog 2011-07-19 21:58:09 UTC (rev 25258)
@@ -8,6 +8,8 @@
At some point we may want to write our own setuid initgroups(3)
helper and avoid sudo entirely.
+ * If chattr fails due to the file not existing, that shouldn't abort
+ the rest of reactivate.
-- Geoffrey Thomas <geofft@mit.edu> Tue, 19 Jul 2011 17:07:54 -0400
Modified: trunk/debathena/config/reactivate/debian/reactivate
===================================================================
--- trunk/debathena/config/reactivate/debian/reactivate 2011-07-19 21:18:04 UTC (rev 25257)
+++ trunk/debathena/config/reactivate/debian/reactivate 2011-07-19 21:58:09 UTC (rev 25258)
@@ -33,7 +33,7 @@
# Cleanup our ticketenv hack
# Make sure nobody was evil
-chattr -i /tmp/ticketenv
+chattr -f -i /tmp/ticketenv || :
# If you made a directory and stored files there, too bad
rm -rf /tmp/ticketenv
