From 0392f3aa208d555d93ec47bacc5aa8c13562407b Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Mon, 19 Nov 2012 19:48:42 +0100
Subject: [PATCH] Import patches-unapplied version 2.100 to
 ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: 5d6be2b8a385d6cc796d0c193cd57a92bb1f4457

New changelog entries:
  * clean up the userdata dir
  * move the tarball around instead of copying it
  * fix quoting of abootimg call harder
---
 debian/changelog      | 8 ++++++++
 live-build/auto/build | 5 +++--
 live-build/auto/clean | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a48f13ea..88d7da19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.100) raring; urgency=low
+
+  * clean up the userdata dir
+  * move the tarball around instead of copying it
+  * fix quoting of abootimg call harder
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 19 Nov 2012 19:48:42 +0100
+
 livecd-rootfs (2.99) raring; urgency=low
 
   * fix quoting in abootimg call for nexus7
diff --git a/live-build/auto/build b/live-build/auto/build
index e9187b66..825b8a68 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -378,12 +378,13 @@ 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 -p userdata
-		cp $PREFIX.rootfs.tar.gz userdata/rootfs.tar.gz
+		mv $PREFIX.rootfs.tar.gz userdata/rootfs.tar.gz
 		make_ext4fs -l 6G -s $PREFIX.img-$FLAVOUR userdata/
+		mv userdata/rootfs.tar.gz $PREFIX.rootfs.tar.gz
 		ln -sf "$PREFIX.img-$FLAVOUR" "$PREFIX.img"
 	fi
 
diff --git a/live-build/auto/clean b/live-build/auto/clean
index d31d4c0d..9ddf752e 100755
--- a/live-build/auto/clean
+++ b/live-build/auto/clean
@@ -7,3 +7,4 @@ lb clean noauto "$@"
 rm -rf config
 rm -f binary.manifest binary.manifest-desktop binary.log
 rm -f livecd.*
+rm -rf userdata