From: hayao <shun819.mail@gmail.com>
Date: Wed, 29 Jul 2020 09:23:41 +0000 (+0900)
Subject: [fix] : copy airootfs (archiso 45)
X-Git-Tag: rc3-alpha1~238^2~18
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e9858dd3fbdb2e6327c69c011aa916308336b6e3;p=alterlinux%2Falterlinux.git

[fix] : copy airootfs (archiso 45)

Fixing ownership in airootfs customization

Fixing wrong ownership of files when copying overlay modifications from
the config's airootfs directory to the working directory in
make_customize_airootfs() by using the cp flag
'--no-preserve=ownership'.

Thanks to Marcos Mello and Francois Dupoux of sysresccd
(https://gitlab.com/fdupoux/sysresccd-src) for making this fix available.
---

diff --git a/build.sh b/build.sh
index a7d7af06..8f9b90e9 100755
--- a/build.sh
+++ b/build.sh
@@ -787,7 +787,7 @@ make_customize_airootfs() {
         for i in "${@}"; do
             local _dir="${i%/}"
             if [[ -d "${_dir}" ]]; then
-                cp -af "${_dir}"/* "${work_dir}/${arch}/airootfs"
+                cp -af --no-preserve=ownership "${_dir}"/* "${work_dir}/${arch}/airootfs"
             fi
         done
     }