fix conflicting x flag issue
This commit is contained in:
parent
ff7e5e76c5
commit
eab250f59d
2 changed files with 15 additions and 4 deletions
|
@ -1,14 +1,24 @@
|
|||
diff --git a/apparmor.d/tunables/multiarch.d/system b/apparmor.d/tunables/multiarch.d/system
|
||||
index be37123f..6490e311 100644
|
||||
index be37123f..81ac4f20 100644
|
||||
--- a/apparmor.d/tunables/multiarch.d/system
|
||||
+++ b/apparmor.d/tunables/multiarch.d/system
|
||||
@@ -106,8 +106,9 @@
|
||||
@@ -106,8 +106,19 @@
|
||||
@{MOUNTS}=@{MOUNTDIRS}/*/ @{run}/user/@{uid}/gvfs/
|
||||
|
||||
# Common places for binaries and libraries across distributions
|
||||
-@{bin}=/{,usr/}{,s}bin
|
||||
-@{lib}=/{,usr/}lib{,exec,32,64}
|
||||
+@{base_paths} = /nix/store/* /etc/profiles/per-user/* /run/current-system/sw
|
||||
+@{package1}={@{w},.,-}
|
||||
+@{package2}=@{package1}@{package1}
|
||||
+@{package4}=@{package2}@{package2}
|
||||
+@{package8}=@{package4}@{package4}
|
||||
+@{package16}=@{package8}@{package8}
|
||||
+@{package32}=@{package16}@{package16}
|
||||
+@{package64}=@{package32}@{package32}
|
||||
+@{nix_package_name}={@{package64},}{@{package32},}{@{package16},}{@{package8},}{@{package4},}{@{package2},}{@{package1},}
|
||||
+
|
||||
+@{nix_store}=/nix/store/@{rand32}-@{nix_package_name}
|
||||
+@{base_paths}=@{nix_store} /etc/profiles/per-user/@{user} /run/current-system/sw
|
||||
+@{bin}=@{base_paths}/bin /{,usr/}{,s}bin
|
||||
+@{lib}=@{base_paths}/lib
|
||||
|
||||
|
|
|
@ -35,7 +35,8 @@ in
|
|||
gamemoded = "disable";
|
||||
pkexec = "complain";
|
||||
xdg-mime = "complain";
|
||||
mimetype = "complain";
|
||||
mimetype = "complain";
|
||||
sudo = "complain";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue