Import patches-unapplied version 1.119 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: df6947ec2b

New changelog entries:
  * Depends: lzma
  * drop tmpfs in general while allowing a envvar to enable it again

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (1.119) maverick; urgency=low
+
+  * Depends: lzma
+  * drop tmpfs in general while allowing a envvar to enable it again
+
+ -- LaMont Jones <lamont@ubuntu.com>  Fri, 11 Jun 2010 08:37:17 -0600
+
 livecd-rootfs (1.118) maverick; urgency=low
 
   * add temporary workaround for genext2fs bug 583317 (wrong filesystem

debian/control

@@ -8,7 +8,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
 
 Package: livecd-rootfs
 Architecture: all
-Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release
+Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma
 Suggests: partimage
 Description: construction script for the livecd rootfs
  livecd-rootfs provides the script used to create the root filesystem

livecd.sh

@@ -103,6 +103,7 @@ PPAMIRROR=ppa.launchpad.net
 ARCH=$(dpkg --print-architecture)
 OPTMIRROR=
 INITRD_COMPRESSOR=lzma
+TMPFS=no
 
 select_mirror () {
     case $ARCH in
@@ -203,8 +204,8 @@ for FS in "$@"; do
     umount ${ROOT} || true
     rm -rf ${ROOT}
     mkdir ${ROOT}
-    # 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
+    # maybe use a tmpfs
+    if  test yes = "$TMPFS"; then
         mount -t tmpfs -o size=8192M tmpfs ${ROOT} && echo using tmpfs
     fi