From 3fa6521c516c7cc929e3d9505d6e3780f79b9c4e Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Mon, 11 Mar 2019 22:31:56 -0600
Subject: [PATCH] Only enable WinPE boot entries if necessary

* Addresses issue #94
---
 .bin/Scripts/build-ufd                    |  6 ++++--
 .linux_items/include/EFI/boot/refind.conf | 10 +++++-----
 .linux_items/include/syslinux/wk_pxe.cfg  |  2 +-
 .linux_items/include/syslinux/wk_sys.cfg  |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.bin/Scripts/build-ufd b/.bin/Scripts/build-ufd
index 89498613..7d3c5234 100755
--- a/.bin/Scripts/build-ufd
+++ b/.bin/Scripts/build-ufd
@@ -573,9 +573,7 @@ w_sources="$(find /mnt/WinPE -iwholename "/mnt/WinPE/sources")"
 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/#UFD#//" /mnt/Dest/EFI/boot/refind.conf
 sed -i "s/${ISO_LABEL}/${UFD_LABEL}/" /mnt/Dest/arch/boot/syslinux/*cfg
-sed -i "s/#UFD#//" /mnt/Dest/arch/boot/syslinux/*cfg
 
 echo "Copying WinPE files..."
 if [[ ! -z "${arg_w:-}" ]]; then
@@ -591,6 +589,10 @@ if [[ ! -z "${arg_w:-}" ]]; then
   rsync ${RSYNC_ARGS} \
     "${w_boot_bcd}" "${w_boot_sdi}" "${w_bootmgr}" "${w_sources}"/* \
     /mnt/Dest/sources/ >> "${LOG_FILE}" 2>&1
+
+  # Uncomment boot entries
+  sed -i "s/#UFD-WINPE#//" /mnt/Dest/EFI/boot/refind.conf
+  sed -i "s/#UFD-WINPE#//" /mnt/Dest/arch/boot/syslinux/*cfg
 fi
 
 echo "Copying Main Kit..."
diff --git a/.linux_items/include/EFI/boot/refind.conf b/.linux_items/include/EFI/boot/refind.conf
index 1406ac73..4ab3be7b 100644
--- a/.linux_items/include/EFI/boot/refind.conf
+++ b/.linux_items/include/EFI/boot/refind.conf
@@ -33,8 +33,8 @@ menuentry "Linux" {
         add_options "loglevel=4 nomodeset nox"
     }
 }
-#UFD#menuentry "WindowsPE" {
-#UFD#    ostype windows
-#UFD#    icon /EFI/boot/icons/wk_win.png
-#UFD#    loader /EFI/microsoft/bootx64.efi
-#UFD#}
+#UFD-WINPE#menuentry "WindowsPE" {
+#UFD-WINPE#    ostype windows
+#UFD-WINPE#    icon /EFI/boot/icons/wk_win.png
+#UFD-WINPE#    loader /EFI/microsoft/bootx64.efi
+#UFD-WINPE#}
diff --git a/.linux_items/include/syslinux/wk_pxe.cfg b/.linux_items/include/syslinux/wk_pxe.cfg
index f8a78220..10112666 100644
--- a/.linux_items/include/syslinux/wk_pxe.cfg
+++ b/.linux_items/include/syslinux/wk_pxe.cfg
@@ -2,7 +2,7 @@ INCLUDE boot/syslinux/wk_head.cfg
 MENU BACKGROUND pxelinux.png
 
 INCLUDE boot/syslinux/wk_pxe_linux.cfg
-#UFD#INCLUDE boot/syslinux/wk_pxe_winpe.cfg
+#UFD-WINPE#INCLUDE boot/syslinux/wk_pxe_winpe.cfg
 #DISABLED_UPSTREAM_BUG#INCLUDE boot/syslinux/wk_hdt.cfg
 
 INCLUDE boot/syslinux/wk_tail.cfg
diff --git a/.linux_items/include/syslinux/wk_sys.cfg b/.linux_items/include/syslinux/wk_sys.cfg
index 55a47e7f..f90e4406 100644
--- a/.linux_items/include/syslinux/wk_sys.cfg
+++ b/.linux_items/include/syslinux/wk_sys.cfg
@@ -1,7 +1,7 @@
 INCLUDE boot/syslinux/wk_head.cfg
 
 INCLUDE boot/syslinux/wk_sys_linux.cfg
-#UFD#INCLUDE boot/syslinux/wk_sys_winpe.cfg
+#UFD-WINPE#INCLUDE boot/syslinux/wk_sys_winpe.cfg
 #DISABLED_UPSTREAM_BUG#INCLUDE boot/syslinux/wk_hdt.cfg
 
 INCLUDE boot/syslinux/wk_tail.cfg