sudo: Always keepVisudo in order to simplify sudo build
This commit is contained in:
parent
8297a26746
commit
ef4ea24420
|
@ -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";
|
||||
|
|
|
@ -22,7 +22,6 @@ let
|
|||
isoImage.storeContents =
|
||||
[ pkgs.glibcLocales
|
||||
pkgs.sudo
|
||||
pkgs.sudoWithVisudo
|
||||
pkgs.docbook5
|
||||
pkgs.docbook5_xsl
|
||||
pkgs.grub
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, coreutils, pam, groff, keepVisudo ? false }:
|
||||
{ stdenv, fetchurl, coreutils, pam, groff }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sudo-1.8.9p4";
|
||||
|
@ -32,11 +32,6 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
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
|
||||
'';
|
||||
|
||||
|
|
|
@ -2082,8 +2082,6 @@ let
|
|||
|
||||
sudo = callPackage ../tools/security/sudo { };
|
||||
|
||||
sudoWithVisudo = sudo.override { keepVisudo = true; };
|
||||
|
||||
suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { };
|
||||
|
||||
super = callPackage ../tools/security/super { };
|
||||
|
|
Loading…
Reference in a new issue