Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2023-05-17 11:11:33 +0300
committernl6720 <nl6720@gmail.com>2023-05-17 11:11:33 +0300
commitdb2b78fd30c41c30717c179eb860f11f27df008c (patch)
tree98c3c60869702c78017be30e611d7a174177d94b /archiso
parent44471540dcbf730c9d3b725cab52cc7af1920b68 (diff)
parent42f645edc3ed14331666ad417df597c829da4600 (diff)
Merge remote-tracking branch 'origin/merge-requests/322'
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
Diffstat (limited to 'archiso')
-rwxr-xr-xarchiso/mkarchiso2
1 files changed, 1 insertions, 1 deletions
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