From 00f18b8d7251083535e2a01110f5340e05ad6f0f Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 25 Aug 2017 14:28:43 -0700 Subject: [PATCH] Import patches-unapplied version 2.451 to ubuntu/artful-proposed Imported using git-ubuntu import. Changelog parent: 8eadac557b6f5f0b23b7c109a659f9649884e8e9 New changelog entries: * Fix a reference to an undefined variable in the ubuntu-cpc hooks, introduced by the previous upload. --- debian/changelog | 7 +++++++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 01da23f6..565b58a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.451) artful; urgency=medium + + * Fix a reference to an undefined variable in the ubuntu-cpc hooks, + introduced by the previous upload. + + -- Steve Langasek Fri, 25 Aug 2017 14:28:43 -0700 + livecd-rootfs (2.450) artful; urgency=medium [ Steve Langasek ] diff --git a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary index 33a19316..83d90442 100755 --- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary @@ -83,8 +83,7 @@ install_grub() { --target=${efi_target} \ --removable \ --uefi-secure-boot \ - --no-nvram \ - --modules="${grub_modules}" + --no-nvram if [ -f mountpoint/boot/efi/EFI/BOOT/grub.cfg ]; then sed -i "s| root| root hd0,gpt1|" mountpoint/boot/efi/EFI/BOOT/grub.cfg