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!" }