Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-04-04 23:01:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Now that grub-related diversions have been factored out in 2.466

Browse Source 
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:23:30 +01:00
parent 482c927f11
commit 4b9e6e811f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
livecd-rootfs (2.471) 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 12:53:43 +0100
livecd-rootfs (2.470) artful; urgency=medium
* Add initial support for preinstallation of snaps in images, and

2
live-build/functions
View File

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