Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2021-04-01 14:24:12 +0200
committerDavid Runge <dvzrv@archlinux.org>2021-04-07 16:40:18 +0000
commit1a9710963996e476790d7a351b57b090866c9b71 (patch)
tree6dee6ed3c05a2d15fe55091023fcccd00cebd7c3
parent09b6127fe8cabaf9a54a3bb864b0e3e009ca8476 (diff)
mkarchiso: also add iso name in grub environment block
-rw-r--r--README.rst6
-rwxr-xr-xarchiso/mkarchiso5
2 files changed, 6 insertions, 5 deletions
diff --git a/README.rst b/README.rst
index cdbe827..15e361b 100644
--- a/README.rst
+++ b/README.rst
@@ -121,14 +121,14 @@ Optionally install archiso's mkinitcpio hooks:
Optional Features
=================
-The iso image contains a grub environment block holding the iso version. This allows to boot the iso image from grub
-with a version specific cow directory to mitigate overlay clashes.
+The iso image contains a grub environment block holding the iso name and version. This allows to
+boot the iso image from grub with a version specific cow directory to mitigate overlay clashes.
.. code:: grub
loopback loop archlinux.iso
load_env -f (loop)/arch/grubenv
linux (loop)/arch/boot/x86_64/vmlinuz-linux ... \
- cow_directory=archlinux/${VERSION} ...
+ cow_directory=${NAME}/${VERSION} ...
initrd (loop)/arch/boot/x86_64/initramfs-linux-lts.img
Contribute
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 439e8d0..f08d8f6 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -937,8 +937,9 @@ _make_version() {
_msg_info "Creating files with iso version..."
printf '%s\n' "${iso_version}" > "${airootfs_dir}/version"
printf '%s\n' "${iso_version}" > "${isofs_dir}/${install_dir}/version"
- printf '%.1024s' "$(printf '# GRUB Environment Block\nVERSION=%s\n%s' "${iso_version}" \
- "$(printf '%0.1s' "#"{1..1024})")" > "${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})")" \
+ > "${isofs_dir}/${install_dir}/grubenv"
_msg_info "Done!"
}