Merge pull request #29768 from Mic92/networkd

networkd: also load builtin modules
This commit is contained in:
Jörg Thalheim 2018-03-01 09:16:18 +00:00 committed by GitHub
commit 12422149a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -650,7 +650,11 @@ let
unitFiles = map (name: { unitFiles = map (name: {
target = "systemd/network/${name}"; target = "systemd/network/${name}";
source = "${cfg.units.${name}.unit}/${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 in
{ {