public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Peter Hoeg 2017-04-14 11:10:49 +08:00
parent 8758f476b3
commit 8f21e089a8
1 changed files with 6 additions and 4 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,6 +8,8 @@ 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"
@ -699,9 +701,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
@ -714,11 +716,11 @@ in
restartTriggers = map (f: f.source) (unitFiles); restartTriggers = map (f: f.source) (unitFiles);
}; };
systemd.services.systemd-networkd-wait-online = { systemd.services.systemd-networkd-wait-online = lib.mkIf waitOnline {
wantedBy = [ "network-online.target" ]; wantedBy = [ "network-online.target" ];
}; };
systemd.services."systemd-network-wait-online@" = { systemd.services."systemd-network-wait-online@" = lib.mkIf waitOnline {
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" ];