From 9f49b02a915160b2d4ad268a5c6b9c27dde2c4b5 Mon Sep 17 00:00:00 2001
From: nl6720 <devnull@nl6720.me>
Date: Tue, 20 May 2025 15:12:09 +0300
Subject: mkarchiso: undeprecate "${isofs_dir}/${install_dir}/grubenv"

There are use cases that rely only on the contents of `${install_dir}`.

As much as it pains me to be reminded of GRUB's existence every time I
look at this directory, let's not break other people's setups just for
that.
---
 CHANGELOG.rst     | 3 +++
 archiso/mkarchiso | 6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2dae6fe..b14bcbf 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -11,6 +11,9 @@ Added
 Changed
 -------
 
+- Undeprecate ``/${install_dir}/grubenv``. There are use cases that rely on extracting only the ``${install_dir}`` from
+  the ISO.
+
 Deprecated
 ----------
 
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index de7bf01..caa978a 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -1918,10 +1918,8 @@ _make_version() {
 
     fi
     if [[ "${buildmode}" == "iso" ]]; then
-        # Write grubenv with version information to ISO 9660
-        # TODO: after sufficient time has passed, do not create this file anymore.
-        #       _make_common_bootmode_grub_cfg and _make_common_grubenv_and_loopbackcfg already create a
-        #       ${isofs_dir}/boot/grub/grubenv file
+        # Write a limited grubenv with version information to install_dir on ISO 9660 for use cases where only the
+        # install_dir is used.
         rm -f -- "${isofs_dir}/${install_dir}/grubenv"
         printf '%.1024s' "$(printf '# GRUB Environment Block\nNAME=%s\nVERSION=%s\n%s' \
             "${iso_name}" "${iso_version}" "$(printf '%0.1s' "#"{1..1024})")" \
-- 
cgit v1.2.3-70-g09d2