faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkarchiso: also add iso name in grub environment block

Browse Source
This commit is contained in:
Christian Hesse 2021-04-01 14:24:12 +02:00 committed by David Runge
parent 09b6127fe8
commit 1a97109639
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.rst
View File

@ -121,14 +121,14 @@ Optionally install archiso's mkinitcpio hooks:
Optional Features Optional Features
================= =================
The iso image contains a grub environment block holding the iso version. This allows to boot the iso image from grub The iso image contains a grub environment block holding the iso name and version. This allows to
with a version specific cow directory to mitigate overlay clashes. boot the iso image from grub with a version specific cow directory to mitigate overlay clashes.
.. code:: grub .. code:: grub
loopback loop archlinux.iso loopback loop archlinux.iso
load_env -f (loop)/arch/grubenv load_env -f (loop)/arch/grubenv
linux (loop)/arch/boot/x86_64/vmlinuz-linux ... \ 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 initrd (loop)/arch/boot/x86_64/initramfs-linux-lts.img
Contribute Contribute

5
archiso/mkarchiso
View File

@ -937,8 +937,9 @@ _make_version() {
_msg_info "Creating files with iso version..." _msg_info "Creating files with iso version..."
printf '%s\n' "${iso_version}" > "${airootfs_dir}/version" printf '%s\n' "${iso_version}" > "${airootfs_dir}/version"
printf '%s\n' "${iso_version}" > "${isofs_dir}/${install_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 '%.1024s' "$(printf '# GRUB Environment Block\nNAME=%s\nVERSION=%s\n%s' \
"$(printf '%0.1s' "#"{1..1024})")" > "${isofs_dir}/${install_dir}/grubenv" "${iso_name}" "${iso_version}" "$(printf '%0.1s' "#"{1..1024})")" \
> "${isofs_dir}/${install_dir}/grubenv"
_msg_info "Done!" _msg_info "Done!"
} }