File 0001-98selinux-microos-Create-.relabelled-marke... of Package microos-tools

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-98selinux-microos-Create-.relabelled-marker-before-r.patch of Package microos-tools (Revision d3edf572a8501ade4221ed4fe055ece0)

Currently displaying revision d3edf572a8501ade4221ed4fe055ece0 , Show latest

From 89a7c537ccdda4e544e032da26c9de6445c4c293 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.de>
Date: Wed, 19 Apr 2023 09:32:13 +0200
Subject: [PATCH 1/2] 98selinux-microos: Create .relabelled marker before
 relabelling

Make sure the .relabelled flag file itself is also labelled correctly.
---
 selinux/98selinux-microos/selinux-microos-relabel.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/selinux/98selinux-microos/selinux-microos-relabel.sh b/selinux/98selinux-microos/selinux-microos-relabel.sh
index ddf9ea4..085b54d 100755
--- a/selinux/98selinux-microos/selinux-microos-relabel.sh
+++ b/selinux/98selinux-microos/selinux-microos-relabel.sh
@@ -48,6 +48,8 @@ rd_microos_relabel()
 	FORCE=
 	[ -e "${ROOT_SELINUX}"/etc/selinux/.autorelabel ] && FORCE="$(cat "${ROOT_SELINUX}"/etc/selinux/.autorelabel)"
 	. "${ROOT_SELINUX}"/etc/selinux/config
+	# Marker when we had relabelled the filesystem. This is relabelled as well.
+	> "${ROOT_SELINUX}"/etc/selinux/.relabelled
 	LANG=C chroot "$ROOT_SELINUX" /sbin/setfiles $FORCE -e /var/lib/overlay -e /proc -e /sys -e /dev -e /etc "/etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts" $(chroot "$ROOT_SELINUX" cut -d" " -f2 /proc/mounts)
         # On overlayfs, st_dev isn't consistent so setfiles thinks it's a different mountpoint, ignoring it.
         LANG=C chroot "$ROOT_SELINUX" find /etc -exec /sbin/setfiles $FORCE "/etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts" \{\} +
@@ -61,9 +63,6 @@ rd_microos_relabel()
 	fi
     done
 
-    # Marker when we had relabelled the filesystem
-    > "$NEWROOT"/etc/selinux/.relabelled
-
     return $ret
 }
 
-- 
2.40.0

Places

File 0001-98selinux-microos-Create-.relabelled-marker-before-r.patch of Package microos-tools (Revision d3edf572a8501ade4221ed4fe055ece0)

Places