From 894ca9ccfcb6eb5330f9a8e9ff0ee125624f6579 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 29 Sep 2017 15:10:45 -0400 Subject: [PATCH] Fix a reference to an undefined variable in a script that's set -u. --- debian/changelog | 6 ++++++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 477f9261..f6bbfa89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.462) UNRELEASED; urgency=medium + + * Fix a reference to an undefined variable in a script that's set -u. + + -- Steve Langasek Fri, 29 Sep 2017 15:10:20 -0400 + livecd-rootfs (2.461) artful; urgency=medium * In subiquity, loadkeys to setup Shift+Tab key combination. 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 5827a6fe..4782f6df 100755 --- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary @@ -62,7 +62,7 @@ install_grub() { efi_boot_dir="/boot/efi/EFI/BOOT" chroot mountpoint mkdir -p "${efi_boot_dir}" - if [ "$SUBPROJECT" = minimize ] && [ -n "$partuuid" ]; then + if [ "${SUBPROJECT:-}" = minimize ] && [ -n "$partuuid" ]; then # FIXME: code duplicated between 032-disk-image.binary # and 033-disk-image-uefi.binary. We want to fix this to not # have initramfs-tools installed at all on these images.