From 22a8f817ca82a456b542831589a792598fcd0391 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 10 Oct 2017 13:49:46 +0100 Subject: [PATCH] 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/ubuntu-cpc/functions | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4dbdcd37..63e59cb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Tue, 10 Oct 2017 13:46:58 +0100 + livecd-rootfs (2.408.19) xenial; urgency=medium [ Nishanth Aravamudan ] diff --git a/live-build/ubuntu-cpc/functions b/live-build/ubuntu-cpc/functions index bc7d4a56..246b839f 100644 --- a/live-build/ubuntu-cpc/functions +++ b/live-build/ubuntu-cpc/functions @@ -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" }