Merge branch 'fix-gwwndsz' of git://github.com/tk-ecotelecom/nixpkgs

Maybe option defaultGatewayWindowSize is used very rarely, but when it is used there will be an error.
This commit is contained in:
Shea Levy 2015-12-25 09:27:36 -05:00
commit 384a4ca4e4

View File

@ -83,13 +83,13 @@ in
# FIXME: get rid of "|| true" (necessary to make it idempotent).
ip route add default via "${cfg.defaultGateway}" ${
optionalString (cfg.defaultGatewayWindowSize != null)
"window ${cfg.defaultGatewayWindowSize}"} || true
"window ${toString cfg.defaultGatewayWindowSize}"} || true
''}
${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6 != "") ''
# FIXME: get rid of "|| true" (necessary to make it idempotent).
ip -6 route add ::/0 via "${cfg.defaultGateway6}" ${
optionalString (cfg.defaultGatewayWindowSize != null)
"window ${cfg.defaultGatewayWindowSize}"} || true
"window ${toString cfg.defaultGatewayWindowSize}"} || true
''}
'';
};