From 917b5a8e49ab6501b76ce9d040018b678fa9c727 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Mon, 19 Nov 2012 18:08:22 +0100
Subject: [PATCH] fix quoting of the abootimg call for nexus7, dont fail if the
 userdata exists

---
 debian/changelog      | 7 +++++++
 live-build/auto/build | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7f56686..0c67566b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.99) UNRELEASED; urgency=low
+
+  * fix quoting in abootimg call for nexus7
+  * dont fail if the userdata dir already exists
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 19 Nov 2012 18:04:13 +0100
+
 livecd-rootfs (2.98) raring; urgency=low
 
   * we want nvidia-tegra3 (the binary) not nvidia-graphics-drivers-tegra3
diff --git a/live-build/auto/build b/live-build/auto/build
index 8a5c014d..e9187b66 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -378,10 +378,10 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
 
 	if [ "$SUBARCH" = "nexus7" ]; then
 		# adjust the bootimg cmdline parameters
-		Chroot chroot 'abootimg -u /boot/installer-${KVERS}.img -c "cmdline=root=/dev/mmcblk0p9 ro console=tty1 fbcon=rotate:1 quiet splash"'
+		Chroot chroot "abootimg -u /boot/installer-${KVERS}.img -c \"cmdline=root=/dev/mmcblk0p9 ro console=tty1 fbcon=rotate:1 quiet splash\""
 
 		# roll the android rootfs images
-		mkdir userdata
+		mkdir -p userdata
 		cp $PREFIX.rootfs.tar.gz userdata/rootfs.tar.gz
 		make_ext4fs -l 6G -s $PREFIX.img-$FLAVOUR userdata/
 		ln -sf "$PREFIX.img-$FLAVOUR" "$PREFIX.img"