diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-07 18:14:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-07 18:14:56 +0000 |
| commit | f1e22d45f0343d2dd3cdcdcf42ef6cf55248e1e1 (patch) | |
| tree | 360e6c594ba9023da17896b939c922b60aa46b72 /nixos | |
| parent | c49bdf33ddcf42132e5e406920deb72432ccc697 (diff) | |
| parent | 6e4d5726025ecda5a10dbf3f6db4300316f95a49 (diff) | |
| download | nixpkgs-f1e22d45f0343d2dd3cdcdcf42ef6cf55248e1e1.tar nixpkgs-f1e22d45f0343d2dd3cdcdcf42ef6cf55248e1e1.tar.gz nixpkgs-f1e22d45f0343d2dd3cdcdcf42ef6cf55248e1e1.tar.bz2 nixpkgs-f1e22d45f0343d2dd3cdcdcf42ef6cf55248e1e1.tar.lz nixpkgs-f1e22d45f0343d2dd3cdcdcf42ef6cf55248e1e1.tar.xz nixpkgs-f1e22d45f0343d2dd3cdcdcf42ef6cf55248e1e1.tar.zst nixpkgs-f1e22d45f0343d2dd3cdcdcf42ef6cf55248e1e1.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/network-filesystems/samba.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/docker-tools.nix | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index d6e2904b3c3..78ea245cb35 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -156,7 +156,6 @@ in securityType = mkOption { type = types.str; default = "user"; - example = "share"; description = "Samba security type"; }; diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index a0e81b613ce..80d527b453f 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -313,5 +313,13 @@ import ./make-test-python.nix ({ pkgs, ... }: { docker.succeed( "docker images --format '{{.Repository}}' | grep -F '${examples.prefixedLayeredImage.imageName}'" ) + + with subtest("buildLayeredImage supports running chown with fakeRootCommands"): + docker.succeed( + "docker load --input='${examples.layeredImageWithFakeRootCommands}'" + ) + docker.succeed( + "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" + ) ''; }) |