From f8264a59c620563b830e362dcc10356c1f68e617 Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Tue, 11 Apr 2017 21:10:56 -0500 Subject: [PATCH] Change remaining CLOUD_IMG_STR references to IMAGE_STR --- live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary | 4 ++-- live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 d7885346..3cf55ed1 100755 --- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary @@ -78,7 +78,7 @@ install_grub() { esac cat << EOF >> mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg -${CLOUD_IMG_STR} +${IMAGE_STR} # For Cloud Image compatability GRUB_PRELOAD_MODULES="${grub_modules}" EOF @@ -93,7 +93,7 @@ EOF if [ -f mountpoint/boot/efi/EFI/BOOT/grub.cfg ]; then sed -i "s| root| root hd0,gpt1|" mountpoint/boot/efi/EFI/BOOT/grub.cfg - sed -i "1i${CLOUD_IMG_STR}" mountpoint/boot/efi/EFI/BOOT/grub.cfg + sed -i "1i${IMAGE_STR}" mountpoint/boot/efi/EFI/BOOT/grub.cfg # For some reason the grub disk is looking for /boot/grub/grub.cfg on # part 15.... chroot mountpoint mkdir -p /boot/efi/boot/grub diff --git a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary index 55e1dc84..bad7297d 100755 --- a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary +++ b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary @@ -36,7 +36,7 @@ install_grub() { # set the kernel commandline to use hvc0 mkdir -p mountpoint/etc/default/grub.d cat << EOF > mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg -${CLOUD_IMG_STR} +${IMAGE_STR} # Set the recordfail timeout GRUB_RECORDFAIL_TIMEOUT=0