Merge lp:~dannf/ubuntu/trusty/cloud-initramfs-tools/lp1411294 into lp:ubuntu/trusty/cloud-initramfs-tools

[dann frazier]

[Scott Moser (smoser)]

i had approved in email with dan.
he uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-25 17:22:34 +0000
+++ debian/changelog	2015-05-19 17:49:56 +0000
@@ -1,3 +1,10 @@
+cloud-initramfs-tools (0.25ubuntu1.14.04.1) trusty-proposed; urgency=medium
+
+  * overlayroot: use required 'workdir' option on overlayfs mount for
+    kernels >= 3.18 (LP: #1411294)
+
+ -- dann frazier <[e-mail]>  Tue, 19 May 2015 11:31:29 -0600
+
 cloud-initramfs-tools (0.25ubuntu1) trusty; urgency=medium
 
   * cloud-initramfs-copymods: Add new package that is useful
 
=== modified file 'overlayroot/scripts/init-bottom/overlayroot'
--- overlayroot/scripts/init-bottom/overlayroot	2013-08-27 16:48:53 +0000
+++ overlayroot/scripts/init-bottom/overlayroot	2015-05-19 17:49:56 +0000
@@ -557,10 +557,18 @@
 overlayroot_driver=${overlayroot_driver:-overlayfs}
 
 # settings based on overlayroot_driver
+workdir=""
 case "${overlayroot_driver}" in
 	overlayfs)
 		mount_type="overlayfs"
 		mount_opts="-o lowerdir=${root_ro},upperdir=${root_rw}/${dir_prefix}"
+		# 3.18+ require 'workdir=' option.
+		case "$(uname -r)" in
+			2*|3.1[01234567]*|3.[0-9].*) :;;
+			*)
+				workdir="${dir_prefix%/}-workdir"
+				mount_opts="${mount_opts},workdir=${root_rw}/${workdir}";;
+		esac
 		mount_opts="${mount_opts} overlayroot ${ROOTMNT}"
 		;;
 	aufs)
@@ -599,6 +607,9 @@
 mkdir -p "${root_rw}/${dir_prefix}" ||
 	fail "failed to create ${dir_prefix} on ${device}"
 
+[ -z "$workdir" ] || mkdir -p "$root_rw/${workdir}" ||
+	fail "failed to create workdir '$workdir' on ${device}"
+
 # root is mounted on ${ROOTMNT}, move it to ${ROOT_RO}.
 mount --move "${ROOTMNT}" "${root_ro}" ||
 	fail "failed to move root away from ${ROOTMNT} to ${root_ro}"
@@ -609,9 +620,11 @@
 # errors and leave the system in a wired state. 
 
 # mount virtual fs ${ROOTMNT} with rw-fs ${root_rw} on top or ro-fs ${root_ro}.
+debug mount -t "$mount_type" $mount_opts
 mount -t "$mount_type" $mount_opts
 if [ $? -ne 0 ]; then
 	log_fail "failed to create new ro/rw layered ${ROOTMNT}"
+	log_fail "mount command was: mount -t $mount_type $mount_opts"
 	# do recovery and try resoring the mount for ${ROOTMNT}
 	mount --move ${root_ro} ${ROOTMNT}
 	if [ $? -ne 0 ]; then