Merge lp:~jani/ubuntu/vivid/initramfs-tools-ubuntu-touch/resize-userdata into lp:ubuntu/vivid/initramfs-tools-ubuntu-touch

[Jani Monoses]

Resize userdata filesystem if it does not fill the whole userdata partition.

Resize userdata filesystem if it does not fill the whole userdata partition.

[Oliver Grawert (ogra)]

merged in https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/stable-phone-overlay

review: Approve

[Oliver Grawert (ogra)]

eeek, totally missed that there is more code in this one ... not merged yet indeed ....

Unmerged revisions

95. By Jani Monoses on 2015-04-24

Resize userdata filesystem on firs boot.

94. By Jani Monoses on 2015-04-23

Add /sbin/resize2fs to support resizing of userdata on first boot.

=== modified file 'hooks/touch'
--- hooks/touch	2015-03-26 17:36:51 +0000
+++ hooks/touch	2015-04-24 07:10:38 +0000
@@ -21,6 +21,7 @@
 copy_exec /sbin/swapon /sbin
 copy_exec /sbin/reboot /sbin
 copy_exec /sbin/e2fsck /sbin
+copy_exec /sbin/resize2fs /sbin
 copy_exec /bin/chown /bin
 copy_exec /bin/mount /bin
 copy_exec /bin/readlink /sbin

=== modified file 'scripts/touch'
--- scripts/touch	2015-04-21 18:53:57 +0000
+++ scripts/touch	2015-04-24 07:10:38 +0000
@@ -163,6 +163,26 @@
 	cd $OLD_PWD
 }
 
+resize_userdata_if_needed() {
+	
+	# See if the filesystem on the userdata partition needs resizing (usually on first boot).
+	# If the difference between the partition size and the filesystem size is above a small
+	# threshold, assume it needs resizing to fill the partition.
+
+	path=$1	
+
+	# Partition size in 1k blocks
+	pblocks=$(grep ${path#/dev/*} /proc/partitions | awk {'print $3'})
+	# Filesystem size in 4k blocks
+	fsblocks=$(dumpe2fs -h $path | grep "Block count" | awk {'print $3'})
+	# Difference between the reported sizes in 1k blocks
+	dblocks=$(($pblocks-4*$fsblocks))
+	if [ $dblocks -gt 10000 ];then
+		resize2fs -f $path
+		echo "initrd: resized userdata filesystem to fill $path" >/dev/kmsg || true
+	fi
+}
+
 mountroot()
 {
 	# list of possible userdata partition names
@@ -217,6 +237,8 @@
 	fsck_end=`date +%s`
 	echo "initrd: checking filesystem for userdata took (including e2fsck) $((fsck_end-fsck_start)) seconds" >/dev/kmsg || true
 
+	resize_userdata_if_needed ${path}
+
 	echo "initrd: mounting $path" >/dev/kmsg || true
 
 	# Mount the data partition to a temporary mount point