From b30aab463831634a368e925a0fb87d6a828bf02d Mon Sep 17 00:00:00 2001 From: Zahoor Mohamed Date: Wed, 21 Dec 2016 20:54:13 +0530 Subject: [PATCH] swarm config file options take precedence over command line arguments #3444 --- cmd/swarm/main.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 04930760ee..c4227d16ba 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -252,6 +252,10 @@ func registerBzzService(ctx *cli.Context, stack *node.Node) { if len(bzzport) > 0 { bzzconfig.Port = bzzport } + networkId := ctx.GlobalUint64(SwarmNetworkIdFlag.Name) + if networkId > 0 { + bzzconfig.NetworkId = networkId + } swapEnabled := ctx.GlobalBool(SwarmSwapEnabled.Name) syncEnabled := ctx.GlobalBoolT(SwarmSyncEnabled.Name)