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.
This commit is contained in:
Dimitri John Ledkov 2017-10-10 13:49:46 +01:00
parent 13c0c8ffd5
commit 22a8f817ca
2 changed files with 11 additions and 1 deletions

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
livecd-rootfs (2.408.20) UNRELEASED; urgency=medium
* 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.
-- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 10 Oct 2017 13:46:58 +0100
livecd-rootfs (2.408.19) xenial; urgency=medium
[ Nishanth Aravamudan ]

View File

@ -279,7 +279,7 @@ replace_grub_root_with_label() {
then
return 0
fi
sed -i -e "s,root=[^ ]\+,root=LABEL=cloudimg-rootfs," \
sed -i -e "s,root=[^ ]*,root=LABEL=cloudimg-rootfs," \
"$CHROOT_ROOT/boot/grub/grub.cfg"
}