diff options
| author | Austin Seipp <aseipp@pobox.com> | 2014-06-18 16:13:53 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2014-06-18 16:13:53 -0500 |
| commit | 4eb7fdcc13459e58714f7282b33dfd29780014ee (patch) | |
| tree | c1d782b7157c2987a7a536ff48114913ec6029a7 /nixos | |
| parent | f72e9c109021968f37ac04473cebc289e7a6fd4a (diff) | |
| parent | 1bb2a094fdeeb49a9caf69a3a2bb839ee65e8e32 (diff) | |
| download | nixpkgs-4eb7fdcc13459e58714f7282b33dfd29780014ee.tar nixpkgs-4eb7fdcc13459e58714f7282b33dfd29780014ee.tar.gz nixpkgs-4eb7fdcc13459e58714f7282b33dfd29780014ee.tar.bz2 nixpkgs-4eb7fdcc13459e58714f7282b33dfd29780014ee.tar.lz nixpkgs-4eb7fdcc13459e58714f7282b33dfd29780014ee.tar.xz nixpkgs-4eb7fdcc13459e58714f7282b33dfd29780014ee.tar.zst nixpkgs-4eb7fdcc13459e58714f7282b33dfd29780014ee.zip | |
Merge pull request #2966 from wkennington/master.sudo
Update and fix sudo
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/security/sudo.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 00b640dd281..cbd1628caae 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -83,7 +83,7 @@ in {src = pkgs.writeText "sudoers-in" cfg.configFile; } # Make sure that the sudoers file is syntactically valid. # (currently disabled - NIXOS-66) - "${pkgs.sudoWithVisudo}/sbin/visudo -f $src -c && + "${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out"; target = "sudoers"; mode = "0440"; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 13677be86e1..98e8142a0df 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -22,7 +22,6 @@ let isoImage.storeContents = [ pkgs.glibcLocales pkgs.sudo - pkgs.sudoWithVisudo pkgs.docbook5 pkgs.docbook5_xsl pkgs.grub |