@cryptotaxi247 / infra-1 / commits / 955be905

* Don't set swapDevices on machines that don't have a swap partition. Systemd is less tolerant of this than mountall: it will cause switching to a new configuration to hang for 90 seconds waiting for the swap device to appear.

* Don't set swapDevices on machines that don't have a swap partition. Systemd is less tolerant of this than mountall: it will cause switching to a new configuration to hang for 90 seconds waiting for the swap device to appear. svn path=/configurations/trunk/tud/; revision=34646

Eelco Dolstra committed Nov 9, 2012 at 10:58 UTC 955be905465b5187d8d2e33cbc0c76cee379f611
3 files changed +4 -2
build-machines-common.nix
-2
@@ -15,8 +15,6 @@ with pkgs.lib;
15 }
16 ];
17
18 - swapDevices = [ { label = "swap"; } ];
19 -
18 nix.extraOptions =
19 ''
20 build-max-silent-time = 3600
build-machines-dell-1950.nix
+2
@@ -11,4 +11,6 @@
11 boot.kernelModules = [ "acpi-cpufreq" "kvm-intel" ];
12
13 nix.maxJobs = 8;
14 +
15 + swapDevices = [ { label = "swap"; } ];
16 }
stan.nix
+2
@@ -8,6 +8,8 @@
8 boot.initrd.kernelModules = [ "mptsas" ];
9 boot.kernelModules = [ "acpi-cpufreq" "kvm-intel" ];
10
11 + swapDevices = [ { label = "swap"; } ];
12 +
13 nix.maxJobs = 8;
14
15 services.httpd.enable = true;