diff options
author | Arian van Putten <arian.vanputten@gmail.com> | 2020-04-22 23:31:43 +0200 |
---|---|---|
committer | Arian van Putten <arian.vanputten@gmail.com> | 2020-04-23 09:53:44 +0200 |
commit | 14395cc68741ae6de4256360204fd192e4038da3 (patch) | |
tree | 2f361350582f1e194ac710fe9611d762c1931218 | |
parent | 434032913660fc7eb45e51a8a2c001d171a2f562 (diff) | |
download | nixpkgs-14395cc68741ae6de4256360204fd192e4038da3.tar nixpkgs-14395cc68741ae6de4256360204fd192e4038da3.tar.gz nixpkgs-14395cc68741ae6de4256360204fd192e4038da3.tar.bz2 nixpkgs-14395cc68741ae6de4256360204fd192e4038da3.tar.lz nixpkgs-14395cc68741ae6de4256360204fd192e4038da3.tar.xz nixpkgs-14395cc68741ae6de4256360204fd192e4038da3.tar.zst nixpkgs-14395cc68741ae6de4256360204fd192e4038da3.zip |
nixos/networkd: Fix restartTriggers
1d61efb7f177f7b70c467ab4940fde0a3481d4dc accidentially changed the restartTriggers of systemd-networkd.service` to point to the attribute name (in this case, a location relative to `/etc`), instead of the location of the network-related unit files in the nix store. This caused systemd-networkd to not get restarted on activation of new networking config, if the file name hasn't changed. Fix this, by pointing this back to the location in the nix store.
-rw-r--r-- | nixos/modules/system/boot/networkd.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 3078f84f6e9..a7580fb1997 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1073,7 +1073,7 @@ in systemd.services.systemd-networkd = { wantedBy = [ "multi-user.target" ]; - restartTriggers = attrNames unitFiles; + restartTriggers = map (x: x.source) (attrValues unitFiles); # prevent race condition with interface renaming (#39069) requires = [ "systemd-udev-settle.service" ]; after = [ "systemd-udev-settle.service" ]; |