Merge pull request #202956 from arcnmx/systemd-networkd-wait-online

This commit is contained in:
Naïm Favier 2022-12-05 17:53:26 +01:00 committed by GitHub
commit 98a5ae3e5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1902,6 +1902,20 @@ in
}; };
systemd.network.wait-online = { systemd.network.wait-online = {
enable = mkOption {
type = types.bool;
default = true;
example = false;
description = lib.mdDoc ''
Whether to enable the systemd-networkd-wait-online service.
systemd-networkd-wait-online can timeout and fail if there are no network interfaces
available for it to manage. When systemd-networkd is enabled but a different service is
responsible for managing the system's internet connection (for example, NetworkManager or
connman are used to manage WiFi connections), this service is unnecessary and can be
disabled.
'';
};
anyInterface = mkOption { anyInterface = mkOption {
description = lib.mdDoc '' description = lib.mdDoc ''
Whether to consider the network online when any interface is online, as opposed to all of them. Whether to consider the network online when any interface is online, as opposed to all of them.
@ -1983,6 +1997,7 @@ in
}; };
systemd.services.systemd-networkd-wait-online = { systemd.services.systemd-networkd-wait-online = {
inherit (cfg.wait-online) enable;
wantedBy = [ "network-online.target" ]; wantedBy = [ "network-online.target" ];
serviceConfig.ExecStart = [ serviceConfig.ExecStart = [
"" ""