From 4a47394879b2cd75b3dbfe1db35d71685b47602d Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 16 Apr 2013 14:00:17 +0200
Subject: [PATCH] ubuntu-touch-android.sh fix virtual fs mounting, make
 unmounting lazy

---
 debian/changelog        | 10 ++++++++++
 ubuntu-touch-android.sh | 13 +++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2564380d..8399a2f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+livecd-rootfs (2.124) UNRELEASED; urgency=low
+
+  * drop the namespace in mount options of ubuntu-touch-android.sh,
+    mount does not like that
+  * actually give chroot a rootdir when calling it
+  * make sure /dev/pts exists in the chroot before mounting something on it
+  * make umount lazy
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 16 Apr 2013 13:53:53 +0200
+
 livecd-rootfs (2.123) raring; urgency=low
 
   * fix typos in debootstrap line of ubuntu-touch-android.sh
diff --git a/ubuntu-touch-android.sh b/ubuntu-touch-android.sh
index 094d2d87..76ba937e 100755
--- a/ubuntu-touch-android.sh
+++ b/ubuntu-touch-android.sh
@@ -19,9 +19,10 @@ case $(hostname --fqdn) in
 esac
 debootstrap --components=main,universe $release $builddir $MIRROR
 
-mount -t devpts devpts-$builddir $builddir/dev/pts
-chroot mount -t proc proc-$builddir /proc
-chroot mount -t sysfs sys-$builddir /sys
+mkdir -p $builddir/dev/pts
+mount -t devpts devpts $builddir/dev/pts
+chroot $builddir mount -t proc proc /proc
+chroot $builddir mount -t sysfs sys /sys
 
 # set up multiarch inside the chroot
 chroot $builddir dpkg --add-architecture i386
@@ -55,8 +56,8 @@ for image in system recovery boot; do
 	cp $builddir/$builddir/out/target/product/$codename/$image.img ./livecd.ubuntu-touch-$codename.$image.img
 done
 
-umount $builddir/sys
-umount $builddir/proc
-umount $builddir/dev/pts
+umount -l $builddir/sys
+umount -l $builddir/proc
+umount -l $builddir/dev/pts
 
 rm -rf $builddir