summaryrefslogtreecommitdiffstats
path: root/nixos
diff options
context:
space:
mode:
authorpngwjpgh <pngwjpgh@users.noreply.github.com>2017-04-09 14:14:04 +0200
committerJoachim F <joachifm@users.noreply.github.com>2017-04-09 13:14:04 +0100
commit773c456ef49e84de75931ce7d95a565888bff096 (patch)
tree2bef3afe63feeafb8a35780aa93621f14e25ab91 /nixos
parent42e13147278afea46d590fa761020b08ce8bdb1e (diff)
networkmanager: fix dispatcher scripts (#24507)
networkmanager used `source` to mean `text` and wrote dispatcher scripts with the default mode (0666), which means networkmanager wouldn't call them.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/networkmanager.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 7255ffc5af4b..7fb2be786980 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -162,9 +162,9 @@ in {
type = types.listOf (types.submodule {
options = {
source = mkOption {
- type = types.str;
+ type = types.path;
description = ''
- A script source.
+ A script.
'';
};
@@ -224,7 +224,7 @@ in {
target = "NetworkManager/dispatcher.d/02overridedns";
}
++ lib.imap (i: s: {
- text = s.source;
+ inherit (s) source;
target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}";
}) cfg.dispatcherScripts;