Author: eelco
Date: Fri Jan 13 13:26:52 2012
New Revision: 31520
URL: https://nixos.org/websvn/nix/?rev=31520&sc=1
Log:
* Prevent merging of some options. P.S. maybe string options
should be "uniq" by default.
Modified:
nixos/trunk/modules/config/power-management.nix
nixos/trunk/modules/tasks/cpu-freq.nix
nixos/trunk/modules/tasks/scsi-link-power-management.nix
Modified: nixos/trunk/modules/config/power-management.nix
==============================================================================
--- nixos/trunk/modules/config/power-management.nix Fri Jan 13 10:32:11
2012 (r31519)
+++ nixos/trunk/modules/config/power-management.nix Fri Jan 13 13:26:52
2012 (r31520)
@@ -91,8 +91,9 @@
"p4_clockmod"
];
- powerManagement.cpuFreqGovernor = "ondemand";
- powerManagement.scsiLinkPolicy = "min_power";
+ powerManagement.cpuFreqGovernor = mkDefault "ondemand";
+ powerManagement.scsiLinkPolicy = mkDefault "min_power";
+
};
}
Modified: nixos/trunk/modules/tasks/cpu-freq.nix
==============================================================================
--- nixos/trunk/modules/tasks/cpu-freq.nix Fri Jan 13 10:32:11 2012
(r31519)
+++ nixos/trunk/modules/tasks/cpu-freq.nix Fri Jan 13 13:26:52 2012
(r31520)
@@ -10,6 +10,7 @@
powerManagement.cpuFreqGovernor = mkOption {
default = "";
example = "ondemand";
+ type = types.uniq types.string;
description = ''
Configure the governor used to regulate the frequence of the
available CPUs. By default, the kernel configures the governor
Modified: nixos/trunk/modules/tasks/scsi-link-power-management.nix
==============================================================================
--- nixos/trunk/modules/tasks/scsi-link-power-management.nix Fri Jan 13
10:32:11 2012 (r31519)
+++ nixos/trunk/modules/tasks/scsi-link-power-management.nix Fri Jan 13
13:26:52 2012 (r31520)
@@ -10,6 +10,7 @@
powerManagement.scsiLinkPolicy = mkOption {
default = "";
example = "min_power";
+ type = types.uniq types.string;
description = ''
Configure the scsi link power management policy. By default,
the kernel configures "max_performance".
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
