summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-03-01 09:16:18 +0000
committerGitHub <noreply@github.com>2018-03-01 09:16:18 +0000
commit12422149a73890c07e19d6929a75ee1b1dfad48d (patch)
tree9cfbfa0553f3c5bac8152b29b5ecf8ad740fe933 /nixos
parent8ed4e67235aebbf481bef293365bc5117dd93c81 (diff)
parentd514dc220e9fad27a46ef329360bb8db2cdf22ea (diff)
downloadnixpkgs-12422149a73890c07e19d6929a75ee1b1dfad48d.tar
nixpkgs-12422149a73890c07e19d6929a75ee1b1dfad48d.tar.gz
nixpkgs-12422149a73890c07e19d6929a75ee1b1dfad48d.tar.bz2
nixpkgs-12422149a73890c07e19d6929a75ee1b1dfad48d.tar.lz
nixpkgs-12422149a73890c07e19d6929a75ee1b1dfad48d.tar.xz
nixpkgs-12422149a73890c07e19d6929a75ee1b1dfad48d.tar.zst
nixpkgs-12422149a73890c07e19d6929a75ee1b1dfad48d.zip
Merge pull request #29768 from Mic92/networkd
networkd: also load builtin modules
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/system/boot/networkd.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index eea10613ea5..7bf7a51a241 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -650,7 +650,11 @@ let
   unitFiles = map (name: {
     target = "systemd/network/${name}";
     source = "${cfg.units.${name}.unit}/${name}";
-  }) (attrNames cfg.units);
+  }) (attrNames cfg.units) ++
+  (map (entry: {
+    target = "systemd/network/${entry}";
+    source = "${config.systemd.package}/lib/systemd/network/${entry}";
+  }) (attrNames (builtins.readDir "${config.systemd.package}/lib/systemd/network")));
 in
 
 {