Merge lp:~xnox/ubuntu/saucy/initramfs-tools-ubuntu-touch/missing-mkdir into lp:ubuntu/saucy/initramfs-tools-ubuntu-touch

[Dimitri John Ledkov]

[lp:~xnox/ubuntu/saucy/initramfs-tools-ubuntu-touch/missing-mkdir]

57. By Dimitri John Ledkov on 2013-10-08

Mount ${rootmnt}/system for the emulator.

[Loïc Minier (lool)]

After discusion on IRC, let's defer to post-13.10 as it's not enough in itself to get a fully working emulator and this would have to go through mako/maguro testing.

review: Disapprove

Unmerged revisions

57. By Dimitri John Ledkov on 2013-10-08

Mount ${rootmnt}/system for the emulator.

56. By Dimitri John Ledkov on 2013-10-08

Create ${rootmnt}/android directory before mounting.

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-03 16:49:11 +0000
+++ debian/changelog	2013-10-08 09:32:24 +0000
@@ -1,3 +1,10 @@
+initramfs-tools-ubuntu-touch (0.57) UNRELEASED; urgency=low
+
+  * Create ${rootmnt}/android directory before mounting.
+  * Mount ${rootmnt}/system for the emulator.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Tue, 08 Oct 2013 10:04:58 +0100
+
 initramfs-tools-ubuntu-touch (0.56) saucy; urgency=low
 
   [ Dmitrijs Ledkovs ]
 
=== modified file 'scripts/touch'
--- scripts/touch	2013-10-03 16:49:11 +0000
+++ scripts/touch	2013-10-08 09:32:24 +0000
@@ -109,7 +109,14 @@
 		[ -z "$device" ] && device="unknown"
 		echo "initrd: device is $device" >/dev/kmsg || true
 
+		# Mount /system for the emulator
+		if [ "$device" = "generic" ]; then
+		    mkdir -p ${rootmnt}/system
+		    mount /dev/mtdblock0 ${rootmnt}/system
+		fi
+
 		# Mount some tmpfs
+		mkdir -p ${rootmnt}/android
 		mount -o rw,size=4096 -t tmpfs none ${rootmnt}/android
 		mount -o rw,nosuid,noexec,relatime,mode=755 -t tmpfs tmpfs ${rootmnt}/run