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

Merge remote-tracking branch 'origin/merge-requests/322'

Browse Source 
By Antonio V
* origin/merge-requests/322:
  Fixed subdirectories copy from grub/ to the ISO
  Subdirectories from grub/ are copied to the ISO

Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/215

See merge request https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/322
This commit is contained in:
nl6720 2023-05-17 11:11:33 +03:00
commit db2b78fd30
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.rst
View File

@ -25,6 +25,8 @@ Fixed
- Wait for ``network-online.target`` to become active before trying to download the script passed via the ``script=`` - Wait for ``network-online.target`` to become active before trying to download the script passed via the ``script=``
boot parameter. boot parameter.
- Subdirectories from ``grub/`` are copied to the ISO.
Removed Removed
------- -------

2
archiso/mkarchiso
View File

@ -553,7 +553,7 @@ _make_common_bootmode_grub_copy_to_isofs() {
files_to_copy+=("${profile}/grub/"!(*.cfg)) files_to_copy+=("${profile}/grub/"!(*.cfg))
fi fi
install -d -m 0755 -- "${isofs_dir}/boot/grub" install -d -m 0755 -- "${isofs_dir}/boot/grub"
install -m 0644 -- "${files_to_copy[@]}" "${isofs_dir}/boot/grub/" cp -r --remove-destination -- "${files_to_copy[@]}" "${isofs_dir}/boot/grub/"
} }
# Prepare GRUB configuration files # Prepare GRUB configuration files