From 6d3fa55a10de5e38571a8b617f5de7f112a52d42 Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Mon, 6 Jun 2022 15:21:37 +0100
Subject: [PATCH] nixos/network: Backport systemd-networkd-wait-online@.service
 from 251

---
 nixos/modules/common.nix  |  3 ---
 nixos/modules/network.nix | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/common.nix b/nixos/modules/common.nix
index fc58eb7..9cde962 100644
--- a/nixos/modules/common.nix
+++ b/nixos/modules/common.nix
@@ -12,9 +12,6 @@ in
           "before accepting login.");
       };
     };
-
-    # Only present in >=22.05, so forward declare
-    documentation.nixos.options.warningsAreErrors = dummyOption;
   };
 
   imports = [
diff --git a/nixos/modules/network.nix b/nixos/modules/network.nix
index cb81498..c744417 100644
--- a/nixos/modules/network.nix
+++ b/nixos/modules/network.nix
@@ -1,6 +1,35 @@
-{ lib, config, ... }:
+{ lib, pkgs, config, ... }:
 let
   inherit (lib) flatten optional mkIf mkDefault mkMerge;
+
+  # TODO: Backported from systemd 251
+  networkd-wait-online-at = pkgs.writeTextDir "lib/systemd/system/systemd-networkd-wait-online@.service" ''
+    #  SPDX-License-Identifier: LGPL-2.1-or-later
+    #
+    #  This file is part of systemd.
+    #
+    #  systemd is free software; you can redistribute it and/or modify it
+    #  under the terms of the GNU Lesser General Public License as published by
+    #  the Free Software Foundation; either version 2.1 of the License, or
+    #  (at your option) any later version.
+
+    [Unit]
+    Description=Wait for Network Interface %i to be Configured
+    Documentation=man:systemd-networkd-wait-online.service(8)
+    DefaultDependencies=no
+    Conflicts=shutdown.target
+    Requires=systemd-networkd.service
+    After=systemd-networkd.service
+    Before=network-online.target shutdown.target
+
+    [Service]
+    Type=oneshot
+    ExecStart=${pkgs.systemd}/lib/systemd/systemd-networkd-wait-online -i %i
+    RemainAfterExit=yes
+
+    [Install]
+    WantedBy=network-online.target
+  '';
 in
 {
   config = mkMerge [
@@ -12,6 +41,10 @@ in
         useNetworkd = mkDefault true;
       };
 
+      systemd = {
+        packages = [ networkd-wait-online-at ];
+      };
+
       services.resolved = {
         domains = [ config.networking.domain ];
         # Explicitly unset fallback DNS (Nix module will not allow for a blank config)