summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-06-21 11:31:34 +0200
committerVladimír Čunát <vcunat@gmail.com>2018-06-22 10:47:05 +0200
commita8c71037e041725d40fbf2f3047347b6833b1703 (patch)
tree68e20468f43e3173221e06137acb1beedd8ae1a6 /nixos
parent11a0d130ff6d50fbda4db7369c20c5add869ad59 (diff)
downloadnixpkgs-a8c71037e041725d40fbf2f3047347b6833b1703.tar
nixpkgs-a8c71037e041725d40fbf2f3047347b6833b1703.tar.gz
nixpkgs-a8c71037e041725d40fbf2f3047347b6833b1703.tar.bz2
nixpkgs-a8c71037e041725d40fbf2f3047347b6833b1703.tar.lz
nixpkgs-a8c71037e041725d40fbf2f3047347b6833b1703.tar.xz
nixpkgs-a8c71037e041725d40fbf2f3047347b6833b1703.tar.zst
nixpkgs-a8c71037e041725d40fbf2f3047347b6833b1703.zip
installer tests: avoid udisks2
This is a temporary hack to fix channel until we resolve #42324.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/installer.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 7da02d9c204..92f400937b9 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -51,6 +51,8 @@ let
 
         hardware.enableAllFirmware = lib.mkForce false;
 
+        services.udisks2.enable = lib.mkDefault false;
+
         ${replaceChars ["\n"] ["\n  "] extraConfig}
       }
     '';
@@ -250,6 +252,8 @@ let
               ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub
               ++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ];
 
+            services.udisks2.enable = mkDefault false;
+
             nix.binaryCaches = mkForce [ ];
             nix.extraOptions =
               ''