Import patches-unapplied version 0.68 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: 0f9e11098d1b720bc005432a478af5fa8be4669e

New changelog entries:
  * Unmount /proc/sys/fs/binfmt_misc, in case binfmt-support is installed
    and manages to mount it.
  * Move MOUNTS variable into cleanup function for clarity; it's used
    nowhere else.

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (0.68) intrepid; urgency=low
+
+  * Unmount /proc/sys/fs/binfmt_misc, in case binfmt-support is installed
+    and manages to mount it.
+  * Move MOUNTS variable into cleanup function for clarity; it's used
+    nowhere else.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 22 Sep 2008 11:52:22 +0100
+
 livecd-rootfs (0.67) intrepid; urgency=low
 
   * Bump linux-lpia to -3.

livecd.sh

@@ -24,7 +24,9 @@ set -eu
 # Depends: debootstrap, rsync, python-minimal|python, procps, squashfs-tools
 
 cleanup() {
-    for mnt in $MOUNTS ${ROOT}lib/modules/*/volatile ${ROOT}var/{lock,run}; do
+    for mnt in ${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev \
+	       ${ROOT}proc/sys/fs/binfmt_misc ${ROOT}proc ${ROOT}sys \
+	       ${ROOT}lib/modules/*/volatile ${ROOT}var/{lock,run}; do
 	umount $mnt || true
     done
 
@@ -152,7 +154,6 @@ ROOT=$(pwd)/chroot-livecd/	# trailing / is CRITICAL
 for FS in "$@"; do
     FSS="$FS${SUBARCH:+-$SUBARCH}"
     IMG=livecd.${FSS}.fsimg
-    MOUNTS="${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev ${ROOT}proc ${ROOT}sys"
     DEV=""
     COMP="main restricted"