From 4844382ec8a2cbfb144d2b84a34797bdaa9ee448 Mon Sep 17 00:00:00 2001
From: Nicholas Tsirakis <tsirakisn@ainfosec.com>
Date: Tue, 2 Jul 2019 14:42:20 -0400
Subject: [PATCH] [copy_to_esp] Limit search to target disk only

OXT-1632

Signed-off-by: Nicholas Tsirakis <tsirakisn@ainfosec.com>
---
 part2/stages/Functions/install-main | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/part2/stages/Functions/install-main b/part2/stages/Functions/install-main
index 9acd144..46db698 100644
--- a/part2/stages/Functions/install-main
+++ b/part2/stages/Functions/install-main
@@ -691,7 +691,16 @@ create_efi_boot_entries()
 
 copy_to_esp()
 {
-    local ESP=$(sfdisk -l -q | grep "EFI System" | awk '{ print $1 }')
+    # TARGET_DISK not defined in upgrades; locate our
+    # installation disk manually.
+    if [ -z "${TARGET_DISK}" ]; then
+        local devnode="$(vgs xenclient --noheadings -o pv_name | sed 's/\s*//g')"
+        local disk="$(get_devnode_disk ${devnode})"
+    else
+        local disk="/dev/${TARGET_DISK}"
+    fi
+
+    local ESP=$(sfdisk -l -q "${disk}" | grep "EFI System" | awk '{ print $1 }')
     if [ "${ESP}" == "" ]; then
         echo "No EFI System Partition on disk ${DISK_DEV}" >&2
         if [ -d /sys/firmware/efi/efivars ]; then