[26815] in Source-Commits
/svn/athena r25772 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Sep 26 15:49:34 2012
Date: Wed, 26 Sep 2012 15:49:26 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201209261949.q8QJnQbk013624@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-09-26 15:49:26 -0400 (Wed, 26 Sep 2012)
New Revision: 25772
Modified:
trunk/debathena/config/reactivate/debian/changelog
trunk/debathena/config/reactivate/debian/debathena-reactivate.init
Log:
In reactivate:
* Bump the chroot's ramdisk to 50% of RAM or 1G, whichever is higher
(Trac: #1207)
Modified: trunk/debathena/config/reactivate/debian/changelog
===================================================================
--- trunk/debathena/config/reactivate/debian/changelog 2012-09-26 17:41:40 UTC (rev 25771)
+++ trunk/debathena/config/reactivate/debian/changelog 2012-09-26 19:49:26 UTC (rev 25772)
@@ -1,3 +1,10 @@
+debathena-reactivate (2.0.41) unstable; urgency=low
+
+ * Bump the chroot's ramdisk to 50% of RAM or 1G, whichever is higher
+ (Trac: #1207)
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 26 Sep 2012 15:49:05 -0400
+
debathena-reactivate (2.0.40) unstable; urgency=low
* Cleanup from r24057, where we had to special-case quickstations via
Modified: trunk/debathena/config/reactivate/debian/debathena-reactivate.init
===================================================================
--- trunk/debathena/config/reactivate/debian/debathena-reactivate.init 2012-09-26 17:41:40 UTC (rev 25771)
+++ trunk/debathena/config/reactivate/debian/debathena-reactivate.init 2012-09-26 19:49:26 UTC (rev 25772)
@@ -25,8 +25,12 @@
# Create a tmpfs where schroot puts overlays. This is needed
# because aufs won't let you put an overlay and underlay on the
# same file system.
+ tmpfssize="50%"
+ if [ "$(machtype -M)" -le 2007518 ]; then
+ tmpfssize="1073741824"
+ fi
if ! mountpoint -q /var/lib/schroot/union/overlay; then
- mount -t tmpfs -o size=1073741824 tmpfs /var/lib/schroot/union/overlay
+ mount -t tmpfs -o size="$tmpfssize" tmpfs /var/lib/schroot/union/overlay
fi
# Enable subtree operations on /media by making it a mount point,
