nixos/tests/apparmor.nix: fix expected.rules

NixOS · Dec 16, 2024 · 7589653 · 7589653
1 parent fc0544f
commit 7589653
Showing 1 changed file with 28 additions and 7 deletions.
diff --git a/nixos/tests/apparmor.nix b/nixos/tests/apparmor.nix
@@ -37,47 +37,68 @@ import ./make-test-python.nix (
       with subtest("apparmorRulesFromClosure"):
           machine.succeed(
               "${pkgs.diffutils}/bin/diff -u ${pkgs.writeText "expected.rules" ''
+                ixr ${pkgs.bash}/libexec/**,
                 mr ${pkgs.bash}/lib/**.so*,
+                mr ${pkgs.bash}/lib64/**.so*,
+                mr ${pkgs.bash}/share/**,
                 r ${pkgs.bash},
                 r ${pkgs.bash}/etc/**,
                 r ${pkgs.bash}/lib/**,
-                r ${pkgs.bash}/share/**,
+                r ${pkgs.bash}/lib64/**,
                 x ${pkgs.bash}/foo/**,
+                ixr ${pkgs.glibc}/libexec/**,
                 mr ${pkgs.glibc}/lib/**.so*,
+                mr ${pkgs.glibc}/lib64/**.so*,
+                mr ${pkgs.glibc}/share/**,
                 r ${pkgs.glibc},
                 r ${pkgs.glibc}/etc/**,
                 r ${pkgs.glibc}/lib/**,
-                r ${pkgs.glibc}/share/**,
+                r ${pkgs.glibc}/lib64/**,
                 x ${pkgs.glibc}/foo/**,
+                ixr ${pkgs.libcap}/libexec/**,
                 mr ${pkgs.libcap}/lib/**.so*,
+                mr ${pkgs.libcap}/lib64/**.so*,
+                mr ${pkgs.libcap}/share/**,
                 r ${pkgs.libcap},
                 r ${pkgs.libcap}/etc/**,
                 r ${pkgs.libcap}/lib/**,
-                r ${pkgs.libcap}/share/**,
+                r ${pkgs.libcap}/lib64/**,
                 x ${pkgs.libcap}/foo/**,
+                ixr ${pkgs.libcap.lib}/libexec/**,
                 mr ${pkgs.libcap.lib}/lib/**.so*,
+                mr ${pkgs.libcap.lib}/lib64/**.so*,
+                mr ${pkgs.libcap.lib}/share/**,
                 r ${pkgs.libcap.lib},
                 r ${pkgs.libcap.lib}/etc/**,
                 r ${pkgs.libcap.lib}/lib/**,
-                r ${pkgs.libcap.lib}/share/**,
+                r ${pkgs.libcap.lib}/lib64/**,
                 x ${pkgs.libcap.lib}/foo/**,
+                ixr ${pkgs.libidn2.out}/libexec/**,
                 mr ${pkgs.libidn2.out}/lib/**.so*,
+                mr ${pkgs.libidn2.out}/lib64/**.so*,
+                mr ${pkgs.libidn2.out}/share/**,
                 r ${pkgs.libidn2.out},
                 r ${pkgs.libidn2.out}/etc/**,
                 r ${pkgs.libidn2.out}/lib/**,
-                r ${pkgs.libidn2.out}/share/**,
+                r ${pkgs.libidn2.out}/lib64/**,
                 x ${pkgs.libidn2.out}/foo/**,
+                ixr ${pkgs.libunistring}/libexec/**,
                 mr ${pkgs.libunistring}/lib/**.so*,
+                mr ${pkgs.libunistring}/lib64/**.so*,
+                mr ${pkgs.libunistring}/share/**,
                 r ${pkgs.libunistring},
                 r ${pkgs.libunistring}/etc/**,
                 r ${pkgs.libunistring}/lib/**,
-                r ${pkgs.libunistring}/share/**,
+                r ${pkgs.libunistring}/lib64/**,
                 x ${pkgs.libunistring}/foo/**,
+                ixr ${pkgs.glibc.libgcc}/libexec/**,
                 mr ${pkgs.glibc.libgcc}/lib/**.so*,
+                mr ${pkgs.glibc.libgcc}/lib64/**.so*,
+                mr ${pkgs.glibc.libgcc}/share/**,
                 r ${pkgs.glibc.libgcc},
                 r ${pkgs.glibc.libgcc}/etc/**,
                 r ${pkgs.glibc.libgcc}/lib/**,
-                r ${pkgs.glibc.libgcc}/share/**,
+                r ${pkgs.glibc.libgcc}/lib64/**,
                 x ${pkgs.glibc.libgcc}/foo/**,
               ''} ${
                 pkgs.runCommand "actual.rules" { preferLocalBuild = true; } ''