about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2018-02-18 23:42:03 +0300
committerNikolay Amiantov <ab@fmap.me>2018-02-19 23:33:54 +0300
commit5ff25fcd7ebc18fe3a0f73fd95831fb267b06734 (patch)
tree961b894fd77e6441a833d812299c0ec1b4b9f2af /nixos/modules
parent996ed0830e052fb32546ea317eb01d910a975c9e (diff)
downloadnixlib-5ff25fcd7ebc18fe3a0f73fd95831fb267b06734.tar
nixlib-5ff25fcd7ebc18fe3a0f73fd95831fb267b06734.tar.gz
nixlib-5ff25fcd7ebc18fe3a0f73fd95831fb267b06734.tar.bz2
nixlib-5ff25fcd7ebc18fe3a0f73fd95831fb267b06734.tar.lz
nixlib-5ff25fcd7ebc18fe3a0f73fd95831fb267b06734.tar.xz
nixlib-5ff25fcd7ebc18fe3a0f73fd95831fb267b06734.tar.zst
nixlib-5ff25fcd7ebc18fe3a0f73fd95831fb267b06734.zip
dhcpcd service: want for both IP stacks
We want to wait for both stacks to be active before declaring that network is active.
So either both default gateways must be specified or only IPv4 if IPv6 is disabled to
avoid dhcpcd for network-online.target.
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/networking/dhcpcd.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index f0f8f1324c5b..e2127518f1ae 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -156,7 +156,7 @@ in
     systemd.services.dhcpcd = let
       cfgN = config.networking;
       hasDefaultGatewaySet = (cfgN.defaultGateway != null && cfgN.defaultGateway.address != "")
-                          || (cfgN.defaultGateway6 != null && cfgN.defaultGateway6.address != "");
+                          && (!cfgN.enableIPv6 || (cfgN.defaultGateway6 != null && cfgN.defaultGateway6.address != ""));
     in
       { description = "DHCP Client";