b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "networkd: only wait for network to be online if configured to do so"

Browse source 
This reverts commit 8f21e089a8.
This commit is contained in:
Peter Hoeg 2017-10-14 14:42:01 +08:00
parent 2cd4ebfe93
commit 0f486c46b2
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/system/boot/networkd.nix
View file

@ -8,8 +8,6 @@ let
cfg = config.systemd.network;
waitOnline = config.networking.waitForOnline;
checkLink = checkUnitConfig "Link" [
(assertOnlyFields [
"Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "Name"
@ -701,9 +699,9 @@ in
config = mkIf config.systemd.network.enable {
systemd.additionalUpstreamSystemUnits = [
"systemd-networkd.service" "systemd-networkd-wait-online.service"
"org.freedesktop.network1.busname"
"systemd-networkd.service"
] ++ optional waitOnline "systemd-networkd-wait-online.service";
];
systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
// mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
@ -716,11 +714,11 @@ in
restartTriggers = map (f: f.source) (unitFiles);
};
systemd.services.systemd-networkd-wait-online = lib.mkIf waitOnline {
systemd.services.systemd-networkd-wait-online = {
wantedBy = [ "network-online.target" ];
};
systemd.services."systemd-network-wait-online@" = lib.mkIf waitOnline {
systemd.services."systemd-network-wait-online@" = {
description = "Wait for Network Interface %I to be Configured";
conflicts = [ "shutdown.target" ];
requisite = [ "systemd-networkd.service" ];