From c0af2ca443436930a12407ac6027af910c7fad37 Mon Sep 17 00:00:00 2001
From: John Chittum <john.chittum@canonical.com>
Date: Mon, 10 Apr 2023 07:27:46 -0500
Subject: [PATCH] fix: riscv64 efi conditional

missing a && between icicle and visionfive, led to /boot/efi still being
in place, and grub-install running instead of exiting the func.
fixes LP:2015750
---
 live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
index cf4628d0..91e77516 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
@@ -455,7 +455,7 @@ EOF
 
             if [ "${SUBARCH:-}" != "nezha" ] && \
                [ "${SUBARCH:-}" != "licheerv" ] && \
-               [ "${SUBARCH:-}" != "icicle" ] \
+               [ "${SUBARCH:-}" != "icicle" ] && \
                [ "${SUBARCH:-}" != "visionfive" ] && \
                [ "${SUBARCH:-}" != "visionfive2" ]; then
                 ## TODO remove below once we have grub-efi-riscv64 for the platforms