summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2019-11-26 15:38:54 +0100
committerSimon Rettberg2019-11-26 15:38:54 +0100
commit6dc79d316d063d479a2336109c7095a1b0829198 (patch)
tree2ae336d3affbfd79b84c011a06d81451831d0c78
parent[*] cd <...> || perror --> cde <...> (diff)
downloadmltk-6dc79d316d063d479a2336109c7095a1b0829198.tar.gz
mltk-6dc79d316d063d479a2336109c7095a1b0829198.tar.xz
mltk-6dc79d316d063d479a2336109c7095a1b0829198.zip
[rootfs-stage32] Keep original perms/owner of files intact
-rwxr-xr-xcore/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
index ff009a5b..610818e4 100755
--- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
+++ b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
@@ -64,6 +64,7 @@ mount -t squashfs -o ro "$ADDON_PATH" "$ADDON_MOUNT_POINT" || \
# Merge any passwd/group/... files
merguez() {
local tmp=$(mktemp)
+ cp -f -a -- "$1" "$tmp" # So we get the original perms/owner
cat "$@" | awk -F: '!n[$1]++' > "$tmp"
mv -f -- "$tmp" "$1"
}