diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-06 04:22:44 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-06 04:22:44 +0800 |
| commit | 2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6 (patch) | |
| tree | d770ff203eec3c730d838e88b7609934b550a56f /cmd/ethereum | |
| parent | 8be1d134aae80390c1b45b86f06c4842fabbcd17 (diff) | |
| parent | 99a1551b20ebb2d8e0a40287e840c56cd55942b1 (diff) | |
| download | dexon-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.tar dexon-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.tar.gz dexon-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.tar.bz2 dexon-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.tar.lz dexon-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.tar.xz dexon-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.tar.zst dexon-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'cmd/ethereum')
| -rw-r--r-- | cmd/ethereum/flags.go | 4 | ||||
| -rw-r--r-- | cmd/ethereum/main.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go index 5bbcf3f36..af57c6a67 100644 --- a/cmd/ethereum/flags.go +++ b/cmd/ethereum/flags.go @@ -49,7 +49,7 @@ var ( AddPeer string MaxPeer int GenAddr bool - UseSeed bool + SeedNode string SecretFile string ExportDir string NonInteractive bool @@ -101,7 +101,7 @@ func Init() { flag.BoolVar(&StartRpc, "rpc", false, "start rpc server") flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server") flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)") - flag.BoolVar(&UseSeed, "seed", true, "seed peers") + flag.StringVar(&SeedNode, "seednode", "poc-8.ethdev.com:30303", "ip:port of seed node to connect to. Set to blank for skip") flag.BoolVar(&SHH, "shh", true, "whisper protocol (on)") flag.BoolVar(&Dial, "dial", true, "dial out connections (on)") flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key") diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 288040ee7..4b16fb79f 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -134,7 +134,7 @@ func main() { utils.StartWebSockets(ethereum, WsPort) } - utils.StartEthereum(ethereum, UseSeed) + utils.StartEthereum(ethereum, SeedNode) if StartJsConsole { InitJsConsole(ethereum) |