[26386] in Source-Commits
/svn/athena r25544 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Fri Jun 1 00:40:47 2012
Date: Fri, 1 Jun 2012 00:40:46 -0400
From: Benjamin Kaduk <kaduk@MIT.EDU>
Message-Id: <201206010440.q514ekN2023813@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: kaduk
Date: 2012-06-01 00:40:46 -0400 (Fri, 01 Jun 2012)
New Revision: 25544
Modified:
trunk/debathena/config/reactivate/debian/changelog
trunk/debathena/config/reactivate/debian/script-athena
Log:
In reactivate:
* Remove unnecessary invocation of cp(1)
Modified: trunk/debathena/config/reactivate/debian/changelog
===================================================================
--- trunk/debathena/config/reactivate/debian/changelog 2012-05-31 23:07:44 UTC (rev 25543)
+++ trunk/debathena/config/reactivate/debian/changelog 2012-06-01 04:40:46 UTC (rev 25544)
@@ -1,3 +1,9 @@
+debathena-reactivate (2.0.32) unstable; urgency=low
+
+ * Remove unnecessary invocation of cp(1)
+
+ -- Benjamin Kaduk <kaduk@mit.edu> Fri, 01 Jun 2012 00:37:29 -0400
+
debathena-reactivate (2.0.31) unstable; urgency=low
* Stop creating a symlink from /var/run/athena-nologin to /etc/nologin,
Modified: trunk/debathena/config/reactivate/debian/script-athena
===================================================================
--- trunk/debathena/config/reactivate/debian/script-athena 2012-05-31 23:07:44 UTC (rev 25543)
+++ trunk/debathena/config/reactivate/debian/script-athena 2012-06-01 04:40:46 UTC (rev 25544)
@@ -3,7 +3,6 @@
NSSDATABASES=""
rm -f "${FSTAB}"
-cp "${FSTAB}.in" "${FSTAB}"
-sed -i -e "s|_VARRUN_|$(readlink -f /var/run)|g" \
+sed -e "s|_VARRUN_|$(readlink -f /var/run)|g" \
-e "s|_VARLOCK_|$(readlink -f /var/lock)|g" \
- -e "s|_DEVSHM_|$(readlink -f /dev/shm)|g" ${FSTAB}
+ -e "s|_DEVSHM_|$(readlink -f /dev/shm)|g" < "${FSTAB}.in" > "${FSTAB}"