diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-18 14:46:37 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-18 14:51:38 +0200 |
commit | b1799084147b0b862eeffd7b4bb526de09fd34a5 (patch) | |
tree | 8b419be010a501c573f120bec9c590ff7041b11d /nixos/tests/networking.nix | |
parent | a40533f70aa7cfe93a6a440150453ac296b249e3 (diff) | |
download | nixpkgs-b1799084147b0b862eeffd7b4bb526de09fd34a5.tar nixpkgs-b1799084147b0b862eeffd7b4bb526de09fd34a5.tar.gz nixpkgs-b1799084147b0b862eeffd7b4bb526de09fd34a5.tar.bz2 nixpkgs-b1799084147b0b862eeffd7b4bb526de09fd34a5.tar.lz nixpkgs-b1799084147b0b862eeffd7b4bb526de09fd34a5.tar.xz nixpkgs-b1799084147b0b862eeffd7b4bb526de09fd34a5.tar.zst nixpkgs-b1799084147b0b862eeffd7b4bb526de09fd34a5.zip |
nixos/networking: network is online if default gw set
Previously services depending on network-online.target would wait until dhcpcd times out if it was enabled and a static network address configuration was used. Setting the default gateway statically is enough for the networking to be considered online. This also adjusts the relevant networking tests to wait for network-online.target instead of just network.target.
Diffstat (limited to 'nixos/tests/networking.nix')
-rw-r--r-- | nixos/tests/networking.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 6a7e628d8ef..7708775f73f 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -105,7 +105,7 @@ let startAll; $client->waitForUnit("network.target"); - $router->waitForUnit("network.target"); + $router->waitForUnit("network-online.target"); # Make sure dhcpcd is not started $client->fail("systemctl status dhcpcd.service"); @@ -157,7 +157,7 @@ let startAll; $client->waitForUnit("network.target"); - $router->waitForUnit("network.target"); + $router->waitForUnit("network-online.target"); # Wait until we have an ip address on each interface $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'"); |