Merge remote-tracking branch 'origin/pr/120'

marmarek · marmarek · commit 8db71da3ee34 · 2024-12-25T05:08:56.000+01:00
* origin/pr/120: Ensure that qubesdb SELinux labels are correct on Fedora 41 Pull request description: /usr/sbin is now considered an alias for /usr/bin, so include rules for /usr/bin to ensure correct labelling. Do not remove the old rules to avoid regression on Fedora 40. Suggested-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> Part-of: QubesOS/qubes-issues#9663
diff --git a/selinux/qubes-meminfo-writer.fc b/selinux/qubes-meminfo-writer.fc
@@ -1,2 +1,3 @@
+/usr/bin/meminfo-writer  -- gen_context(system_u:object_r:qubes_meminfo_writer_exec_t,s0)
 /usr/sbin/meminfo-writer -- gen_context(system_u:object_r:qubes_meminfo_writer_exec_t,s0)
 /run/meminfo-writer\.pid -- gen_context(system_u:object_r:qubes_meminfo_writer_var_run_t,s0)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+/usr/bin/meminfo-writer -- gen_context(system_u:object_r:qubes_meminfo_writer_exec_t,s0)`
`1`	`2`	`/usr/sbin/meminfo-writer -- gen_context(system_u:object_r:qubes_meminfo_writer_exec_t,s0)`
`2`	`3`	`/run/meminfo-writer\.pid -- gen_context(system_u:object_r:qubes_meminfo_writer_var_run_t,s0)`