From 6dc79d316d063d479a2336109c7095a1b0829198 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 26 Nov 2019 15:38:54 +0100
Subject: [rootfs-stage32] Keep original perms/owner of files intact

---
 .../rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons     | 1 +
 1 file changed, 1 insertion(+)

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"
 }
-- 
cgit v1.2.3-55-g7522