summary refs log tree commit diff
path: root/nixos/modules/tasks
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2018-02-19 23:30:49 +0300
committerNikolay Amiantov <ab@fmap.me>2018-02-19 23:33:54 +0300
commitd77984f571b11811240414d55b61390d9b90b6f1 (patch)
treef29c44de46f2baa32512d2f5f7c83fb63c734401 /nixos/modules/tasks
parent5ff25fcd7ebc18fe3a0f73fd95831fb267b06734 (diff)
downloadnixlib-d77984f571b11811240414d55b61390d9b90b6f1.tar
nixlib-d77984f571b11811240414d55b61390d9b90b6f1.tar.gz
nixlib-d77984f571b11811240414d55b61390d9b90b6f1.tar.bz2
nixlib-d77984f571b11811240414d55b61390d9b90b6f1.tar.lz
nixlib-d77984f571b11811240414d55b61390d9b90b6f1.tar.xz
nixlib-d77984f571b11811240414d55b61390d9b90b6f1.tar.zst
nixlib-d77984f571b11811240414d55b61390d9b90b6f1.zip
network-interfaces-scripted service: delay setup if IPv6 is disabled
Even if IPv6 gateway is set, there's no need to set it early if IPv6 is disabled.
Diffstat (limited to 'nixos/modules/tasks')
-rw-r--r--nixos/modules/tasks/network-interfaces-scripted.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 63d07832d105..2687a64ff4c2 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -80,7 +80,7 @@ let
           else optional (dev != null && dev != "lo" && !config.boot.isContainer) (subsystemDevice dev);
 
         hasDefaultGatewaySet = (cfg.defaultGateway != null && cfg.defaultGateway.address != "")
-                            || (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "");
+                            || (cfg.enableIPv6 && cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "");
 
         networkLocalCommands = {
           after = [ "network-setup.service" ];