mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

sudo: Always keepVisudo in order to simplify sudo build

Browse source
This commit is contained in:
William A. Kennington III 2014-06-16 05:08:57 -05:00
parent 8297a26746
commit ef4ea24420
4 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/security/sudo.nix
View file

@ -83,7 +83,7 @@ in
{src = pkgs.writeText "sudoers-in" cfg.configFile; } {src = pkgs.writeText "sudoers-in" cfg.configFile; }
# Make sure that the sudoers file is syntactically valid. # Make sure that the sudoers file is syntactically valid.
# (currently disabled - NIXOS-66) # (currently disabled - NIXOS-66)
"${pkgs.sudoWithVisudo}/sbin/visudo -f $src -c && "${pkgs.sudo}/sbin/visudo -f $src -c &&
cp $src $out"; cp $src $out";
target = "sudoers"; target = "sudoers";
mode = "0440"; mode = "0440";

1
nixos/tests/installer.nix
View file

@ -22,7 +22,6 @@ let
isoImage.storeContents = isoImage.storeContents =
[ pkgs.glibcLocales [ pkgs.glibcLocales
pkgs.sudo pkgs.sudo
pkgs.sudoWithVisudo
pkgs.docbook5 pkgs.docbook5
pkgs.docbook5_xsl pkgs.docbook5_xsl
pkgs.grub pkgs.grub

7
pkgs/tools/security/sudo/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, coreutils, pam, groff, keepVisudo ? false }: { stdenv, fetchurl, coreutils, pam, groff }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sudo-1.8.9p4"; name = "sudo-1.8.9p4";
@ -32,11 +32,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = '' postInstall = ''
# ‘visudo’ does not make sense on NixOS - except for checking sudoers
# file syntax
rm ${if keepVisudo then "" else "$out/sbin/visudo"} \
$out/share/man/man8/visudo.8
rm $out/share/doc/sudo/ChangeLog rm $out/share/doc/sudo/ChangeLog
''; '';

2
pkgs/top-level/all-packages.nix
View file

@ -2082,8 +2082,6 @@ let
sudo = callPackage ../tools/security/sudo { }; sudo = callPackage ../tools/security/sudo { };
sudoWithVisudo = sudo.override { keepVisudo = true; };
suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { }; suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { };
super = callPackage ../tools/security/super { }; super = callPackage ../tools/security/super { };