AimeeOS/aimee-os
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init-storage: Drop -c argument to cp

Browse Source 
Busybox `cp` doesn't implement `-c` (copy SELinux context).  GNU
coreutils has deprecated it as well.
This commit is contained in:
Dustin
2024-12-13 18:50:15 -06:00
parent b3760e7345
commit e4407b1573
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
overlay/usr/libexec/init-storage
View File

@@ -23,7 +23,7 @@ copy_var() {
echo 'Copying /var contents to data volume' echo 'Copying /var contents to data volume'
mount -o subvol=var "${dev}" "${tmpdir}" || exit mount -o subvol=var "${dev}" "${tmpdir}" || exit
cp -acuv /var/. "${tmpdir}" || exit cp -auv /var/. "${tmpdir}" || exit
umount "${tmpdir}" umount "${tmpdir}"
} }
@@ -129,7 +129,7 @@ setup_etc() {
echo 'Initializing writable paths in /etc' echo 'Initializing writable paths in /etc'
mount -o subvol=etc "${dev}" "${tmpdir}" || exit mount -o subvol=etc "${dev}" "${tmpdir}" || exit
if [ ! -f "${tmpdir}"/shadow ]; then if [ ! -f "${tmpdir}"/shadow ]; then
cp -ca /etc/shadow "${tmpdir}"/shadow || exit cp -a /etc/shadow "${tmpdir}"/shadow || exit
fi fi
mount -o bind "${tmpdir}"/shadow /etc/shadow || exit mount -o bind "${tmpdir}"/shadow /etc/shadow || exit
if [ -f /etc/aimee-os/writable-etc ]; then if [ -f /etc/aimee-os/writable-etc ]; then
@@ -141,7 +141,7 @@ setup_etc() {
mkdir -p "${tmpdir}/${path%/*}" mkdir -p "${tmpdir}/${path%/*}"
;; ;;
esac esac
cp -ca /etc/"${path}" "${tmpdir}/${path}" cp -a /etc/"${path}" "${tmpdir}/${path}"
elif [ "${type}" = d ]; then elif [ "${type}" = d ]; then
mkdir -p "${tmpdir}/${path}" mkdir -p "${tmpdir}/${path}"
elif [ "${type}" = f ]; then elif [ "${type}" = f ]; then