mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-03 06:19:10 +03:00
Merge master into staging-next
This commit is contained in:
commit
97b9d455ea
381 changed files with 799 additions and 643 deletions
|
@ -29,6 +29,14 @@ import ./make-test-python.nix (
|
|||
security.apparmor.enable = true;
|
||||
|
||||
security.wrappers = {
|
||||
disabled = {
|
||||
enable = false;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
setuid = true;
|
||||
source = "${busybox pkgs}/bin/busybox";
|
||||
program = "disabled_busybox";
|
||||
};
|
||||
suidRoot = {
|
||||
owner = "root";
|
||||
group = "root";
|
||||
|
@ -112,6 +120,9 @@ import ./make-test-python.nix (
|
|||
# actually makes the apparmor policy for ping, but there's no convenient
|
||||
# test for that one.
|
||||
machine.succeed("ping -c 1 127.0.0.1")
|
||||
|
||||
# Test that the disabled wrapper is not present.
|
||||
machine.fail("test -e /run/wrappers/bin/disabled_busybox")
|
||||
'';
|
||||
}
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue