Merge lp:~stgraber/ubuntu/trusty/initramfs-tools-ubuntu-touch/enable-discard into lp:ubuntu/trusty/initramfs-tools-ubuntu-touch

[Stéphane Graber]

Adds discard (TRIM) support when mounting the main writable block device (userdata).

This has been confirmed to work (device still boots fine) on mako and grouper. The way the flag works in the kernel, it should be fine on any device, if the underlying block device doesn't support it, it'll simply be ignored.

I'm not setting this flag for any of the loop mounted partitions because those are typically read-only anyway (so nothing to TRIM) and support of TRIM on ext2 loop-mounted over ext4 isn't particularly clear.

[Oliver Grawert (ogra)]

If you are sure it will just be ignored and not cause data loss or anything on MMCs that do not support it, then go ahead. Approved ...

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-25 17:43:03 +0000
+++ debian/changelog	2013-12-13 20:45:15 +0000
@@ -1,3 +1,9 @@
+initramfs-tools-ubuntu-touch (0.64) UNRELEASED; urgency=low
+
+  * Enable discard (TRIM) for the userdata partition.
+
+ -- Stéphane Graber <[e-mail]>  Fri, 13 Dec 2013 14:50:24 -0500
+
 initramfs-tools-ubuntu-touch (0.63) trusty; urgency=low
 
   * Workaround behaviour change in busybox where loop mounted fs that

=== modified file 'scripts/touch'
--- scripts/touch	2013-11-25 17:42:56 +0000
+++ scripts/touch	2013-12-13 20:45:15 +0000
@@ -81,7 +81,7 @@
 	echo "initrd: mounting $path" >/dev/kmsg || true
 
 	# Mount the data partition to a temporary mount point
-	mount $path /tmpmnt
+	mount -o discard $path /tmpmnt
 
 	# Loop-mounted flipped model
 	if [ -e /tmpmnt/system.img ]; then