* 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"
];
powerManagement.cpuFreqGovernor = "ondemand";
powerManagement.scsiLinkPolicy = "min_power";
powerManagement.cpuFreqGovernor = mkDefault "ondemand";
powerManagement.scsiLinkPolicy = mkDefault "min_power";
};
}

View File

@ -10,6 +10,7 @@ with pkgs.lib;
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

View File

@ -10,6 +10,7 @@ with pkgs.lib;
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".