Merge pull request #15557 from MaximilianMeister/bootnodes-toml

cmd/utils: bootstrap nodes in config file were not respected
ethereum · Nov 28, 2017 · e323ed5 · e323ed5
2 parents 6bb61ee + 62dc530
commit e323ed5
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -584,6 +584,8 @@ func setBootstrapNodes(ctx *cli.Context, cfg *p2p.Config) {
 		urls = params.TestnetBootnodes
 	case ctx.GlobalBool(RinkebyFlag.Name):
 		urls = params.RinkebyBootnodes
+	case cfg.BootstrapNodes != nil:
+		return // already set, don't apply defaults.
 	}
 
 	cfg.BootstrapNodes = make([]*discover.Node, 0, len(urls))