diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-03-04 06:29:08 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-03-04 06:29:08 +0000 |
| commit | a5dcde1a6fb3d5d1b8c29a46fd5926de1640ab45 (patch) | |
| tree | 48ef6035eeb21c889456ce2369626ebd6c4193bf /nixos | |
| parent | 1aa59bfd3f4108a91cfd79e4d4fd85daab9a83df (diff) | |
| download | nixlib-a5dcde1a6fb3d5d1b8c29a46fd5926de1640ab45.tar nixlib-a5dcde1a6fb3d5d1b8c29a46fd5926de1640ab45.tar.gz nixlib-a5dcde1a6fb3d5d1b8c29a46fd5926de1640ab45.tar.bz2 nixlib-a5dcde1a6fb3d5d1b8c29a46fd5926de1640ab45.tar.lz nixlib-a5dcde1a6fb3d5d1b8c29a46fd5926de1640ab45.tar.xz nixlib-a5dcde1a6fb3d5d1b8c29a46fd5926de1640ab45.tar.zst nixlib-a5dcde1a6fb3d5d1b8c29a46fd5926de1640ab45.zip | |
Revert "networkd: also load builtin modules"
This reverts commit d514dc220e9fad27a46ef329360bb8db2cdf22ea. breaks unpredicable network interfaces: https://github.com/NixOS/nixpkgs/pull/29768#issuecomment-370172863
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/networkd.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 7bf7a51a2417..eea10613ea58 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -650,11 +650,7 @@ let unitFiles = map (name: { target = "systemd/network/${name}"; source = "${cfg.units.${name}.unit}/${name}"; - }) (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"))); + }) (attrNames cfg.units); in { |