From 9e7ee2c892d07ae64f17134843faca9060489926 Mon Sep 17 00:00:00 2001
From: Said Syakin <said.syakin@gmail.com>
Date: Mon, 29 Jan 2018 01:47:03 +0400
Subject: [PATCH] First conf.file commit

---
 cmd/geth/config.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cmd/geth/config.go b/cmd/geth/config.go
index 27490c4048..f5d33354b1 100644
--- a/cmd/geth/config.go
+++ b/cmd/geth/config.go
@@ -123,6 +123,13 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
 		if err := loadConfig(file, &cfg); err != nil {
 			utils.Fatalf("%v", err)
 		}
+	} else {
+		// Load config file from default place.
+		if err := loadConfig("./geth_conf.toml", &cfg); err != nil {
+			if ctx.Command.Name != "dumpconfig" {
+				utils.Fatalf("Config not found: %v. Put config file here or set config path with flag --config /path/to/your_config.toml", err)
+			}
+		}
 	}
 
 	// Apply flags.