From 341f424eae741bead3a1c169458791f37af74547 Mon Sep 17 00:00:00 2001
From: 2Shirt <1923621+2Shirt@users.noreply.github.com>
Date: Tue, 22 May 2018 20:47:18 -0600
Subject: [PATCH] Use a different label for combined kits

* WK_LINUX doesn't reflect what the UFDs actually contain
---
 .bin/Scripts/build-ufd | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.bin/Scripts/build-ufd b/.bin/Scripts/build-ufd
index cabc7ba0..76c2b141 100755
--- a/.bin/Scripts/build-ufd
+++ b/.bin/Scripts/build-ufd
@@ -469,7 +469,8 @@ if [ -z ${KIT_NAME_FULL+x} ]; then
     echo -e "${RED}ERROR${CLEAR}: failed to load settings from ${MAIN_PY}"
     abort
 fi
-UFD_LABEL="${KIT_NAME_SHORT}_LINUX"
+ISO_LABEL="${KIT_NAME_SHORT}_LINUX"
+UFD_LABEL="${KIT_NAME_SHORT}_UFD"
 
 # Check if root
 if [[ "$EUID" -ne 0 ]]; then
@@ -555,6 +556,8 @@ mount "${WINPE_ISO}" /mnt/WinPE -r >> "${LOG_FILE}" 2>&1
 # Copy files
 echo "Copying Linux files..."
 rsync ${RSYNC_ARGS} /mnt/Linux/* /mnt/Dest/ >> "${LOG_FILE}" 2>&1
+sed -i "s/${ISO_LABEL}/${UFD_LABEL}/" /mnt/Dest/EFI/boot/refind.conf
+sed -i "s/${ISO_LABEL}/${UFD_LABEL}/" /mnt/Dest/arch/boot/syslinux/*cfg
 
 echo "Copying WinPE files..."
 rsync ${RSYNC_ARGS} /mnt/WinPE/{Boot,bootmgr{,.efi},en-us,sources} /mnt/Dest/ >> "${LOG_FILE}" 2>&1