* Prevent merging of some options. P.S. maybe string options

should be "uniq" by default.

svn path=/nixos/trunk/; revision=31520
This commit is contained in:
Eelco Dolstra 2012-01-13 13:26:52 +00:00
parent 7be82b3f59
commit cc41bce79d
3 changed files with 5 additions and 2 deletions

View File

@ -91,8 +91,9 @@ in
"p4_clockmod" "p4_clockmod"
]; ];
powerManagement.cpuFreqGovernor = "ondemand"; powerManagement.cpuFreqGovernor = mkDefault "ondemand";
powerManagement.scsiLinkPolicy = "min_power"; powerManagement.scsiLinkPolicy = mkDefault "min_power";
}; };
} }

View File

@ -10,6 +10,7 @@ with pkgs.lib;
powerManagement.cpuFreqGovernor = mkOption { powerManagement.cpuFreqGovernor = mkOption {
default = ""; default = "";
example = "ondemand"; example = "ondemand";
type = types.uniq types.string;
description = '' description = ''
Configure the governor used to regulate the frequence of the Configure the governor used to regulate the frequence of the
available CPUs. By default, the kernel configures the governor available CPUs. By default, the kernel configures the governor

View File

@ -10,6 +10,7 @@ with pkgs.lib;
powerManagement.scsiLinkPolicy = mkOption { powerManagement.scsiLinkPolicy = mkOption {
default = ""; default = "";
example = "min_power"; example = "min_power";
type = types.uniq types.string;
description = '' description = ''
Configure the scsi link power management policy. By default, Configure the scsi link power management policy. By default,
the kernel configures "max_performance". the kernel configures "max_performance".