From 437bef18ca1c070e78e8b522f1057a6ff6343049 Mon Sep 17 00:00:00 2001 From: Alexandre Pujol Date: Mon, 18 Mar 2024 01:03:44 +0000 Subject: [PATCH] feat(abs): redeine the DE users paths. --- apparmor.d/abstractions/mesa.d/complete | 22 ++++++------------- .../{systemd-users => system-users} | 9 +++++--- 2 files changed, 13 insertions(+), 18 deletions(-) rename apparmor.d/tunables/multiarch.d/{systemd-users => system-users} (68%) diff --git a/apparmor.d/abstractions/mesa.d/complete b/apparmor.d/abstractions/mesa.d/complete index ea0a73564..09354fdb9 100644 --- a/apparmor.d/abstractions/mesa.d/complete +++ b/apparmor.d/abstractions/mesa.d/complete @@ -2,18 +2,10 @@ # Copyright (C) 2021-2024 Alexandre Pujol # SPDX-License-Identifier: GPL-2.0-only - # Extra Mesa rules for GDM - /var/lib/gdm{3,}/.cache/ w, - /var/lib/gdm{3,}/.cache/mesa_shader_cache/ rw, - /var/lib/gdm{3,}/.cache/mesa_shader_cache/index rw, - /var/lib/gdm{3,}/.cache/mesa_shader_cache/@{h}@{h}/ rw, - /var/lib/gdm{3,}/.cache/mesa_shader_cache/@{h}@{h}/@{hex} rw, - /var/lib/gdm{3,}/.cache/mesa_shader_cache/@{h}@{h}/@{hex}.tmp rwk, - - # Extra Mesa rules for SDDM - /var/lib/sddm/.cache/ w, - /var/lib/sddm/.cache/mesa_shader_cache/ rw, - /var/lib/sddm/.cache/mesa_shader_cache/index rw, - /var/lib/sddm/.cache/mesa_shader_cache/@{h}@{h}/ rw, - /var/lib/sddm/.cache/mesa_shader_cache/@{h}@{h}/@{hex} rw, - /var/lib/sddm/.cache/mesa_shader_cache/@{h}@{h}/@{hex}.tmp rwk, + # Extra Mesa rules for desktop environments + owner @{desktop_cache_dirs}/ w, + owner @{desktop_cache_dirs}/mesa_shader_cache/ rw, + owner @{desktop_cache_dirs}/mesa_shader_cache/index rw, + owner @{desktop_cache_dirs}/mesa_shader_cache/@{h}@{h}/ rw, + owner @{desktop_cache_dirs}/mesa_shader_cache/@{h}@{h}/@{hex} rw, + owner @{desktop_cache_dirs}/mesa_shader_cache/@{h}@{h}/@{hex}.tmp rwk, diff --git a/apparmor.d/tunables/multiarch.d/systemd-users b/apparmor.d/tunables/multiarch.d/system-users similarity index 68% rename from apparmor.d/tunables/multiarch.d/systemd-users rename to apparmor.d/tunables/multiarch.d/system-users index dac0cf121..379936ed7 100644 --- a/apparmor.d/tunables/multiarch.d/systemd-users +++ b/apparmor.d/tunables/multiarch.d/system-users @@ -8,16 +8,19 @@ @{GDM_HOME}=/var/lib/gdm{,3}/ @{gdm_cache_dirs}=@{GDM_HOME}/.cache/ @{gdm_config_dirs}=@{GDM_HOME}/.config/ +@{gdm_local_dirs}=@{GDM_HOME}/.local/ @{gdm_share_dirs}=@{GDM_HOME}/.local/share/ # Full path of the SDDM configuration directories @{SDDM_HOME}=/var/lib/sddm/ @{sddm_cache_dirs}=@{SDDM_HOME}/.cache/ @{sddm_config_dirs}=@{SDDM_HOME}/.config/ +@{sddm__local_dirs}=@{SDDM_HOME}/.local/ @{sddm_share_dirs}=@{SDDM_HOME}/.local/share/ # Full path of all DE configuration directories @{DESKTOP_HOME}=@{GDM_HOME} @{SDDM_HOME} -@{desktop_cache_dirs}=@{DESKTOP_HOME}/.cache/ -@{desktop_config_dirs}=@{DESKTOP_HOME}/.config/ -@{desktop_share_dirs}=@{DESKTOP_HOME}/.local/share/ +@{desktop_cache_dirs}=@{gdm_cache_dirs} @{sddm_cache_dirs} +@{desktop_config_dirs}=@{gdm_config_dirs} @{sddm_config_dirs} +@{desktop_local_dirs}=@{gdm_local_dirs} @{sddm__local_dirs} +@{desktop_share_dirs}=@{gdm_share_dirs} @{gdm_share_dirs}