diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2019-02-23 16:43:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-23 16:43:05 +0100 |
commit | d3216be6d9dc75bef896c5ef63e846a9bc0b01f4 (patch) | |
tree | 7c8686a8a14d4bf245c6d603c2c4ab003643a624 /lib/modules.nix | |
parent | 55adb547b4f1b831baf60c12be03551050d5cca0 (diff) | |
parent | dcbd13631964cc2977df7faead75deb3bee749a8 (diff) |
Merge pull request #54528 from cdepillabout/module-alias-uses-priority
lib/modules: Change mkAliasOptionModule to use the priority for the alias
Diffstat (limited to 'lib/modules.nix')
-rw-r--r-- | lib/modules.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index 5c9d66d8f97b..a41c9da610ac 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -596,6 +596,9 @@ rec { forwards any definitions of boot.copyKernels to boot.loader.grub.copyKernels while printing a warning. + + This also copies over the priority from the aliased option to the + non-aliased option. */ mkRenamedOptionModule = from: to: doRename { inherit from to; @@ -690,16 +693,7 @@ rec { use = id; }; - /* Like ‘mkAliasOptionModule’, but copy over the priority of the option as well. */ - mkAliasOptionModuleWithPriority = from: to: doRename { - inherit from to; - visible = true; - warn = false; - use = id; - withPriority = true; - }; - - doRename = { from, to, visible, warn, use, withPriority ? false }: + doRename = { from, to, visible, warn, use, withPriority ? true }: { config, options, ... }: let fromOpt = getAttrFromPath from options; |