Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso/mkarchiso
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2023-05-17 15:11:26 +0300
committernl6720 <nl6720@gmail.com>2023-05-17 15:11:26 +0300
commitb468327442d3f57da214b988e4c71d9e96ce46f9 (patch)
tree8798ab9a1865950545096f479becb5c56a5746aa /archiso/mkarchiso
parentdb2b78fd30c41c30717c179eb860f11f27df008c (diff)
parent14b2e44d9040ac24017268e309d3abfb14831d7e (diff)
Merge remote-tracking branch 'origin/merge-requests/325'
By shivanandvp * origin/merge-requests/325: mkarchiso: Fix the cp command arguments to retain mkarchiso's behavior prior to the GNU Coreutils update. Fixes Issue #214 See merge request https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/325
Diffstat (limited to 'archiso/mkarchiso')
-rwxr-xr-xarchiso/mkarchiso2
1 files changed, 1 insertions, 1 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 23e0a75..e991b52 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -390,7 +390,7 @@ _make_customize_airootfs() {
if [[ ! -d "${pacstrap_dir}${passwd[5]}" ]]; then
install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${pacstrap_dir}${passwd[5]}"
fi
- cp -dnRT --preserve=mode,timestamps,links -- "${pacstrap_dir}/etc/skel/." "${pacstrap_dir}${passwd[5]}"
+ cp -dRT --update=none --preserve=mode,timestamps,links -- "${pacstrap_dir}/etc/skel/." "${pacstrap_dir}${passwd[5]}"
chmod -f 0750 -- "${pacstrap_dir}${passwd[5]}"
chown -hR -- "${passwd[2]}:${passwd[3]}" "${pacstrap_dir}${passwd[5]}"
else