From 7014cade97b575cca5321e317226efd97baf7056 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Sat, 17 Jun 2023 19:16:15 -0400
Subject: remove documentary comments from partvi

---
 src/partvi | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/partvi b/src/partvi
index edf219a..54e534c 100755
--- a/src/partvi
+++ b/src/partvi
@@ -388,31 +388,5 @@ iterate_partitions copy_data_to_mounted_target_filesystems
 time loudly $sudo eatmydata -- grub-install --boot-directory="$BOOT_DIR" "$whole" --target=i386-pc
 time loudly $sudo eatmydata -- grub-install --boot-directory="$BOOT_DIR" "$whole" --target=x86_64-efi --removable --efi-directory="$EFI_DIR" || true
 
-ventoy_efi_dir=../ventoy-EFI-BOOT
 valdik_efi_dir=../import-grub-bootx64-efi/3
-if false
-then
-    # Ugly Ventoy hack.  Finally got EFI boot working!!
-    $sudo mv -v "$EFI_DIR"/EFI/BOOT/grubx64.efi "$EFI_DIR"/EFI/BOOT/grub.efi
-    # Ventoy BOOTX64.EFI boots grub.efi
-    $sudo cp -v --preserve=timestamps -t "$EFI_DIR"/EFI/BOOT/ -- $ventoy_efi_dir/BOOTX64.EFI
-elif true
-then
-    # Same ugly hack but w/ Ventoy's upstream <https://github.com/ValdikSS/Super-UEFIinSecureBoot-Disk>
-    # Valdik BOOTX64.EFI boots grubx64.efi
-    $sudo cp -v --preserve=timestamps -t "$EFI_DIR"/EFI/BOOT/ -- $valdik_efi_dir/BOOTX64.EFI
-elif false
-then
-    # Same ugly hack but using Ventoy's upstream, valdik. We chain-load valdik's
-    # second stage with Ventoy's BOOTX64.EFI because valdik's first stage
-    # doesn't work in versions marked "3-" (older version "3" works).
-    $sudo cp -v --preserve=timestamps -t "$EFI_DIR"/EFI/BOOT/ -- $ventoy_efi_dir/BOOTX64.EFI
-    $sudo cp -v --preserve=timestamps -- $valdik_efi_dir/grubx64.efi "$EFI_DIR"/EFI/BOOT/grub.efi
-    $sudo mv -v "$EFI_DIR"/EFI/BOOT/grubx64.efi "$EFI_DIR"/EFI/BOOT/grubx64_real.efi
-elif false
-then
-    # Here is valdik's version 3 working, with its own second stage, and the
-    # third stage replaced with our grub:
-    $sudo mv -v "$EFI_DIR"/EFI/BOOT/grubx64.efi "$EFI_DIR"/EFI/BOOT/grubx64_real.efi
-    $sudo cp -v --preserve=timestamps -t "$EFI_DIR"/EFI/BOOT/ -- $valdik_efi_dir/BOOTX64.EFI $valdik_efi_dir/grubx64.efi
-fi
+$sudo cp -v --preserve=timestamps -t "$EFI_DIR"/EFI/BOOT/ -- "$valdik_efi_dir"/BOOTX64.EFI
-- 
cgit v1.2.3