summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2016-10-02 16:34:37 +0200
committerGitHub <noreply@github.com>2016-10-02 16:34:37 +0200
commit0906a0f19718605a8074c1c1bf0b3368f8e0d09c (patch)
tree77d768b4693a4d5b05858609f22782c461c1b9bd /nixos/modules/system
parentc2ee2a723f4d97de650e972e69c03acb5c2197da (diff)
parentfc0dc65f416ccc3e5cc4acfca7aaf93b50890670 (diff)
downloadnixpkgs-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar
nixpkgs-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.gz
nixpkgs-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.bz2
nixpkgs-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.lz
nixpkgs-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.xz
nixpkgs-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.zst
nixpkgs-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.zip
Merge pull request #18491 from groxxda/network-interfaces
Replace Network-interfaces.target
Diffstat (limited to 'nixos/modules/system')
-rw-r--r--nixos/modules/system/boot/networkd.nix1
-rw-r--r--nixos/modules/system/boot/systemd-lib.nix2
2 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 2cf6a4cca9a..dbb9bced94c 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -667,7 +667,6 @@ in
 
     systemd.services.systemd-networkd = {
       wantedBy = [ "multi-user.target" ];
-      before = [ "network-interfaces.target" ];
       restartTriggers = [ config.environment.etc."systemd/network".source ];
     };
 
diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix
index 2e93693cbfc..997770b8bec 100644
--- a/nixos/modules/system/boot/systemd-lib.nix
+++ b/nixos/modules/system/boot/systemd-lib.nix
@@ -182,7 +182,7 @@ rec {
         mkdir -p $out/getty.target.wants/
         ln -s ../autovt@tty1.service $out/getty.target.wants/
 
-        ln -s ../local-fs.target ../remote-fs.target ../network.target \
+        ln -s ../local-fs.target ../remote-fs.target \
         ../nss-lookup.target ../nss-user-lookup.target ../swap.target \
         $out/multi-user.target.wants/
       ''}