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