summary refs log tree commit diff
diff options
context:
space:
mode:
authorNaïm Favier <n@monade.li>2022-12-05 17:53:26 +0100
committerGitHub <noreply@github.com>2022-12-05 17:53:26 +0100
commit98a5ae3e5ded52f2e4265fb614080b6e1fe41855 (patch)
tree9ccdb06ac3027f45abf5e06b8a07cd1195924820
parent450ebe5c753d1bdcbd1b7c503bf58b1d340ac95e (diff)
parent51b5602b458f8ab2b62f397fe98dcd16b7f44135 (diff)
downloadnixpkgs-98a5ae3e5ded52f2e4265fb614080b6e1fe41855.tar
nixpkgs-98a5ae3e5ded52f2e4265fb614080b6e1fe41855.tar.gz
nixpkgs-98a5ae3e5ded52f2e4265fb614080b6e1fe41855.tar.bz2
nixpkgs-98a5ae3e5ded52f2e4265fb614080b6e1fe41855.tar.lz
nixpkgs-98a5ae3e5ded52f2e4265fb614080b6e1fe41855.tar.xz
nixpkgs-98a5ae3e5ded52f2e4265fb614080b6e1fe41855.tar.zst
nixpkgs-98a5ae3e5ded52f2e4265fb614080b6e1fe41855.zip
Merge pull request #202956 from arcnmx/systemd-networkd-wait-online
-rw-r--r--nixos/modules/system/boot/networkd.nix15
1 files changed, 15 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 5f40ee9c08d..188f2f64dc8 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -1902,6 +1902,20 @@ in
     };
 
     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 {
         description = lib.mdDoc ''
           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 = {
+        inherit (cfg.wait-online) enable;
         wantedBy = [ "network-online.target" ];
         serviceConfig.ExecStart = [
           ""