Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-25 09:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.471 to ubuntu/artful-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: fb1b5e73e30b505db023b93e2184f32bdd0c753a

New changelog entries:
  * 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:26:21 +01:00 committed by usd-importer
parent fb1b5e73e3
commit 84ef6ff8e3
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) artful; 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:26:21 +0100
livecd-rootfs (2.470) artful; urgency=medium livecd-rootfs (2.470) artful; urgency=medium
* Add initial support for preinstallation of snaps in images, and * 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 then
return 0 return 0
fi 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" "$CHROOT_ROOT/boot/grub/grub.cfg"
} }