Ubuntu
cloud-initramfs-tools package

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

  1. Trusty (14.04)
  2. lp1411294
  3. Merge into trusty
Proposed by dann frazier
Status: Merged
Merge reported by: dann frazier
Merged at revision: not available
Proposed branch: lp:~dannf/ubuntu/trusty/cloud-initramfs-tools/lp1411294
Merge into: lp:ubuntu/trusty/cloud-initramfs-tools
Diff against target: 59 lines (+20/-0)
2 files modified
debian/changelog (+7/-0)
overlayroot/scripts/init-bottom/overlayroot (+13/-0)
To merge this branch: bzr merge lp:~dannf/ubuntu/trusty/cloud-initramfs-tools/lp1411294
Reviewer Review Type Date Requested Status
Scott Moser Approve
Review via email: mp+259528@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

i had approved in email with dan.
he uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-03-25 17:22:34 +0000
3+++ debian/changelog 2015-05-19 17:49:56 +0000
4@@ -1,3 +1,10 @@
5+cloud-initramfs-tools (0.25ubuntu1.14.04.1) trusty-proposed; urgency=medium
6+
7+ * overlayroot: use required 'workdir' option on overlayfs mount for
8+ kernels >= 3.18 (LP: #1411294)
9+
10+ -- dann frazier <dannf@ubuntu.com> Tue, 19 May 2015 11:31:29 -0600
11+
12 cloud-initramfs-tools (0.25ubuntu1) trusty; urgency=medium
13
14 * cloud-initramfs-copymods: Add new package that is useful
15
16=== modified file 'overlayroot/scripts/init-bottom/overlayroot'
17--- overlayroot/scripts/init-bottom/overlayroot 2013-08-27 16:48:53 +0000
18+++ overlayroot/scripts/init-bottom/overlayroot 2015-05-19 17:49:56 +0000
19@@ -557,10 +557,18 @@
20 overlayroot_driver=${overlayroot_driver:-overlayfs}
21
22 # settings based on overlayroot_driver
23+workdir=""
24 case "${overlayroot_driver}" in
25 overlayfs)
26 mount_type="overlayfs"
27 mount_opts="-o lowerdir=${root_ro},upperdir=${root_rw}/${dir_prefix}"
28+ # 3.18+ require 'workdir=' option.
29+ case "$(uname -r)" in
30+ 2*|3.1[01234567]*|3.[0-9].*) :;;
31+ *)
32+ workdir="${dir_prefix%/}-workdir"
33+ mount_opts="${mount_opts},workdir=${root_rw}/${workdir}";;
34+ esac
35 mount_opts="${mount_opts} overlayroot ${ROOTMNT}"
36 ;;
37 aufs)
38@@ -599,6 +607,9 @@
39 mkdir -p "${root_rw}/${dir_prefix}" ||
40 fail "failed to create ${dir_prefix} on ${device}"
41
42+[ -z "$workdir" ] || mkdir -p "$root_rw/${workdir}" ||
43+ fail "failed to create workdir '$workdir' on ${device}"
44+
45 # root is mounted on ${ROOTMNT}, move it to ${ROOT_RO}.
46 mount --move "${ROOTMNT}" "${root_ro}" ||
47 fail "failed to move root away from ${ROOTMNT} to ${root_ro}"
48@@ -609,9 +620,11 @@
49 # errors and leave the system in a wired state.
50
51 # mount virtual fs ${ROOTMNT} with rw-fs ${root_rw} on top or ro-fs ${root_ro}.
52+debug mount -t "$mount_type" $mount_opts
53 mount -t "$mount_type" $mount_opts
54 if [ $? -ne 0 ]; then
55 log_fail "failed to create new ro/rw layered ${ROOTMNT}"
56+ log_fail "mount command was: mount -t $mount_type $mount_opts"
57 # do recovery and try resoring the mount for ${ROOTMNT}
58 mount --move ${root_ro} ${ROOTMNT}
59 if [ $? -ne 0 ]; then

Subscribers

People subscribed via source and target branches

to all changes: