Merge ~noorez-kassam/ubuntu/+source/initramfs-tools:my-fixes into ~ubuntu-kernel/ubuntu/+source/initramfs-tools:ubuntu

Proposed by Noorez on 2017-03-31
Status: Needs review
Proposed branch: ~noorez-kassam/ubuntu/+source/initramfs-tools:my-fixes
Merge into: ~ubuntu-kernel/ubuntu/+source/initramfs-tools:ubuntu
Diff against target: 31 lines (+11/-1)
2 files modified
debian/changelog (+8/-0)
scripts/local (+3/-1)
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2017-03-31 Pending
Review via email: mp+321514@code.launchpad.net
To post a comment you must log in.

Unmerged commits

eef0f0a... by Noorez Kassam <email address hidden> on 2017-03-31

initramfs-tools/scripts/local: Fix loop mounting
LP: #1317437

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 86019e0..591197b 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+initramfs-tools (0.125ubuntu3) UNRELEASED; urgency=medium
7+
8+ * initramfs-tools/scripts/local: Correctly configure the
9+ loop device to allow remounting as rw during
10+ boot (LP: #1317437)
11+
12+ -- Noorez Kassam <noorez.kassam@gmail.com> Thu, 30 Mar 2017 22:50:40 -0600
13+
14 initramfs-tools (0.125ubuntu2) yakkety; urgency=medium
15
16 * Make busybox-initramfs a real runtime dependency, fixing
17diff --git a/scripts/local b/scripts/local
18index 441428b..6bf62ab 100644
19--- a/scripts/local
20+++ b/scripts/local
21@@ -204,7 +204,9 @@ able to reboot again and resume the installation.
22 modprobe ${FSTYPE}
23
24 # FIXME This has no error checking
25- mount ${roflag} -o loop -t ${FSTYPE} ${LOOPFLAGS} "/host/${LOOP#/}" ${rootmnt}
26+ loopdev=`losetup -f`
27+ losetup ${loopdev} "/host/${LOOP#/}"
28+ mount ${roflag} -t ${FSTYPE} ${LOOPFLAGS} ${loopdev} ${rootmnt}
29
30 if [ -d ${rootmnt}/host ]; then
31 mount -o move /host ${rootmnt}/host

Subscribers

People subscribed via source and target branches