From 32711a8aa2b22c3c8310ae0b2da5099feefec1a9 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Sat, 5 Jun 2010 06:51:05 -0600 Subject: [PATCH] Only use tmpfs on amd64, due to space restrictions on the current build machines. --- debian/changelog | 7 +++++++ livecd.sh | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index eff49d83..9401c4f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (1.117) maverick; urgency=low + + * Only use tmpfs on amd64, due to space restrictions on the current + build machines. + + -- LaMont Jones Sat, 05 Jun 2010 06:50:24 -0600 + livecd-rootfs (1.116) maverick; urgency=low [Michael Casadevall] diff --git a/livecd.sh b/livecd.sh index f3bf125d0..127387ec 100755 --- a/livecd.sh +++ b/livecd.sh @@ -203,8 +203,8 @@ for FS in "$@"; do umount ${ROOT} || true rm -rf ${ROOT} mkdir ${ROOT} - # if we have > 1GB of RAM, use a tmpfs - if awk '/^MemTotal:/ { exit !(int($2/1024) > 1024)}' /proc/meminfo; then + # if we are on amd64 and have > 1GB of RAM, use a tmpfs + if test $(uname -m) = x86_64 && awk '/^MemTotal:/ { exit !(int($2/1024) > 1024)}' /proc/meminfo; then mount -t tmpfs -o size=8192M tmpfs ${ROOT} && echo using tmpfs fi