summary refs log tree commit diff
path: root/nixos/modules/system/boot
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-04-29 20:45:09 +0200
committerGitHub <noreply@github.com>2018-04-29 20:45:09 +0200
commit1937b810b64a5df53157facce86a7da50e50f6c0 (patch)
treed206873731b8fc0755fc1944f39bea96c13a829d /nixos/modules/system/boot
parent80bf73b11c6e5b4f9fdf499d85a7d66f6be04f90 (diff)
parent236703f9f3ac1d0904d63940d00f885dfeeb854b (diff)
downloadnixlib-1937b810b64a5df53157facce86a7da50e50f6c0.tar
nixlib-1937b810b64a5df53157facce86a7da50e50f6c0.tar.gz
nixlib-1937b810b64a5df53157facce86a7da50e50f6c0.tar.bz2
nixlib-1937b810b64a5df53157facce86a7da50e50f6c0.tar.lz
nixlib-1937b810b64a5df53157facce86a7da50e50f6c0.tar.xz
nixlib-1937b810b64a5df53157facce86a7da50e50f6c0.tar.zst
nixlib-1937b810b64a5df53157facce86a7da50e50f6c0.zip
Merge pull request #39340 from xeji/interim-fix-39069
nixos/networkd: wait for udev to settle before starting networkd
Diffstat (limited to 'nixos/modules/system/boot')
-rw-r--r--nixos/modules/system/boot/networkd.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index e95ca27914ec..9aa557ac8595 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -713,6 +713,9 @@ in
     systemd.services.systemd-networkd = {
       wantedBy = [ "multi-user.target" ];
       restartTriggers = map (f: f.source) (unitFiles);
+      # prevent race condition with interface renaming (#39069)
+      requires = [ "systemd-udev-settle.service" ];
+      after = [ "systemd-udev-settle.service" ];
     };
 
     systemd.services.systemd-networkd-wait-online = {