diff options
author | Alexander Ried <ried@mytum.de> | 2016-09-10 18:03:59 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-09-10 18:03:59 +0200 |
commit | 27bc34f1e471991e43df028edc51159b12405120 (patch) | |
tree | 755a9ff93c09e6affd01878667ba351c659cf3a7 /nixos/modules/virtualisation | |
parent | a28bbba6fc89a72fc65d08b98d79d2fda310b95c (diff) | |
download | nixlib-27bc34f1e471991e43df028edc51159b12405120.tar nixlib-27bc34f1e471991e43df028edc51159b12405120.tar.gz nixlib-27bc34f1e471991e43df028edc51159b12405120.tar.bz2 nixlib-27bc34f1e471991e43df028edc51159b12405120.tar.lz nixlib-27bc34f1e471991e43df028edc51159b12405120.tar.xz nixlib-27bc34f1e471991e43df028edc51159b12405120.tar.zst nixlib-27bc34f1e471991e43df028edc51159b12405120.zip |
treewide: deprecate ip-up.target (#18319)
Systemd upstream provides targets for networking. This also includes a target network-online.target. In this PR I remove / replace most occurrences since some of them were even wrong and could delay startup.
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r-- | nixos/modules/virtualisation/azure-agent.nix | 3 | ||||
-rw-r--r-- | nixos/modules/virtualisation/brightbox-image.nix | 4 | ||||
-rw-r--r-- | nixos/modules/virtualisation/google-compute-image.nix | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index a89cd454dc73..6817eb837a01 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -178,7 +178,8 @@ in systemd.services.waagent = { wantedBy = [ "multi-user.target" ]; - after = [ "ip-up.target" "sshd.service" ]; + after = [ "network-online.target" "sshd.service" ]; + wants = [ "network-online.target" ]; path = [ pkgs.e2fsprogs ]; description = "Windows Azure Agent Service"; diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix index ab49d8871f85..e2905913b6c5 100644 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ b/nixos/modules/virtualisation/brightbox-image.nix @@ -116,8 +116,8 @@ in wantedBy = [ "multi-user.target" "sshd.service" ]; before = [ "sshd.service" ]; - wants = [ "ip-up.target" ]; - after = [ "ip-up.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; path = [ pkgs.wget pkgs.iproute ]; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 59b77dde5d9a..489b612f1675 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -134,8 +134,8 @@ in wantedBy = [ "sshd.service" ]; before = [ "sshd.service" ]; - after = [ "network-online.target" "ip-up.target" ]; - wants = [ "network-online.target" "ip-up.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google'"; mktemp = "mktemp --tmpdir=/run"; in |