Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.rst2
-rwxr-xr-xarchiso/mkarchiso2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4c68d6e..8503cb2 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -25,6 +25,8 @@ Fixed
- Wait for ``network-online.target`` to become active before trying to download the script passed via the ``script=``
boot parameter.
+- Subdirectories from ``grub/`` are copied to the ISO.
+
Removed
-------
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index e0806bd..23e0a75 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -553,7 +553,7 @@ _make_common_bootmode_grub_copy_to_isofs() {
files_to_copy+=("${profile}/grub/"!(*.cfg))
fi
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