public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos.tests.installer: Fix test failures due to network being disabled

Browse Source
This commit is contained in:
Ricardo M. Correia 2014-06-17 05:15:29 +02:00
parent 50287f2c02
commit f8e108c865
3 changed files with 4 additions and 1 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.sudo.override {keepVisudo = true;}}/sbin/visudo -f $src -c && "${pkgs.sudoWithVisudo}/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,6 +22,7 @@ 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

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

@ -2080,6 +2080,8 @@ 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 { };