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

2 files changed, 2 insertions, 2 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8503cb2..a4cd42f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -24,8 +24,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.
+- Modify the commandline options to a ``cp`` command in ``mkarchiso`` so that the entire script does not exit with failure when a custom ``.bashrc`` file is supplied with the archiso configuration. This fix was needed after **GNU Coreutils** recently changed the behaviour of the ``-n`` (or ``--no-clobber``) commandline option to the ``cp`` command.
 
 Removed
 -------
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