From 84ef6ff8e3e67562bf44191ec9b0c3da4237b4ff Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 10 Oct 2017 13:26:21 +0100 Subject: [PATCH] Import patches-unapplied version 2.471 to ubuntu/artful-proposed 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. --- debian/changelog | 10 ++++++++++ live-build/functions | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f147d14e..ff6590da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Tue, 10 Oct 2017 13:26:21 +0100 + livecd-rootfs (2.470) artful; urgency=medium * Add initial support for preinstallation of snaps in images, and diff --git a/live-build/functions b/live-build/functions index ec6d15a7..f05aaf8e 100644 --- a/live-build/functions +++ b/live-build/functions @@ -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" }