livecd-rootfs

Merge lp:~xnox/livecd-rootfs/fix-fs-label into lp:livecd-rootfs

  1. fix-fs-label
  2. Merge into trunk
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 1554
Proposed branch: lp:~xnox/livecd-rootfs/fix-fs-label
Merge into: lp:livecd-rootfs
Diff against target: 29 lines (+11/-1)
2 files modified
debian/changelog (+10/-0)
live-build/functions (+1/-1)
To merge this branch: bzr merge lp:~xnox/livecd-rootfs/fix-fs-label
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Francis Ginther (community) Approve
Philip Roche (community) Approve
Canonical Foundations Team Pending
Review via email: mp+332053@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Philip Roche (philroche) wrote :

Following conversation on IRC this looks good. +1

review: Approve
Revision history for this message
Steve Langasek (vorlon) :
review: Needs Fixing
Revision history for this message
Francis Ginther (fginther) wrote :

As discussed in IRC, I think this should tolerate both the empty and non-empty root values.

Revision history for this message
Francis Ginther (fginther) wrote :

That looks good.

review: Approve
Revision history for this message
Steve Langasek (vorlon) :
review: Approve
lp:~xnox/livecd-rootfs/fix-fs-label updated
1554. By Dimitri John Ledkov

Now that grub-related diversions have been factored out in 2.466
instead of having bogus root=stuff arg generated in grub.cfg, it is
actually empty. Therefore update the sed command to make the arg in
the root= token optional. This should resolve non-booting livecd cpc
images.

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 2017-10-09 01:49:34 +0000
3+++ debian/changelog 2017-10-10 12:23:40 +0000
4@@ -1,3 +1,13 @@
5+livecd-rootfs (2.471) UNRELEASED; urgency=medium
6+
7+ * Now that grub-related diversions have been factored out in 2.466
8+ instead of having bogus root=stuff arg generated in grub.cfg, it is
9+ actually empty. Therefore update the sed command to make the arg in
10+ the root= token optional. This should resolve non-booting livecd cpc
11+ images.
12+
13+ -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 10 Oct 2017 12:53:43 +0100
14+
15 livecd-rootfs (2.470) artful; urgency=medium
16
17 * Add initial support for preinstallation of snaps in images, and
18
19=== modified file 'live-build/functions'
20--- live-build/functions 2017-10-05 06:50:26 +0000
21+++ live-build/functions 2017-10-10 12:23:40 +0000
22@@ -281,7 +281,7 @@
23 then
24 return 0
25 fi
26- sed -i -e "s,root=[^ ]\+,root=LABEL=${fs_label}," \
27+ sed -i -e "s,root=[^ ]*,root=LABEL=${fs_label}," \
28 "$CHROOT_ROOT/boot/grub/grub.cfg"
29 }
30

Subscribers

People subscribed via source and target branches