Merge pull request #2293 from kobigurk/develop

Adds --keystore

cmd/geth/main.go

@@ -284,6 +284,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
 		utils.GenesisFileFlag,
 		utils.BootnodesFlag,
 		utils.DataDirFlag,
+		utils.KeyStoreDirFlag,
 		utils.BlockchainVersionFlag,
 		utils.OlympicFlag,
 		utils.FastSyncFlag,

cmd/geth/usage.go

@@ -63,6 +63,7 @@ var AppHelpFlagGroups = []flagGroup{
 		Name: "ETHEREUM",
 		Flags: []cli.Flag{
 			utils.DataDirFlag,
+			utils.KeyStoreDirFlag,
 			utils.NetworkIdFlag,
 			utils.OlympicFlag,
 			utils.TestNetFlag,

cmd/utils/flags.go

@@ -102,6 +102,10 @@ var (
 		Usage: "Data directory for the databases and keystore",
 		Value: DirectoryString{common.DefaultDataDir()},
 	}
+	KeyStoreDirFlag = DirectoryFlag{
+		Name:  "keystore",
+		Usage: "Directory for the keystore (default = inside the datadir)",
+	}
 	NetworkIdFlag = cli.IntFlag{
 		Name:  "networkid",
 		Usage: "Network identifier (integer, 0=Olympic, 1=Frontier, 2=Morden)",
@@ -393,6 +397,16 @@ func MustMakeDataDir(ctx *cli.Context) string {
 	return ""
 }
 
+// MakeKeyStoreDir resolves the folder to use for storing the account keys from the
+// set command line flags, returning the explicitly requested path, or one inside
+// the data directory otherwise.
+func MakeKeyStoreDir(datadir string, ctx *cli.Context) string {
+	if path := ctx.GlobalString(KeyStoreDirFlag.Name); path != "" {
+		return path
+	}
+	return filepath.Join(datadir, "keystore")
+}
+
 // MakeIPCPath creates an IPC path configuration from the set command line flags,
 // returning an empty string if IPC was explicitly disabled, or the set path.
 func MakeIPCPath(ctx *cli.Context) string {
@@ -526,7 +540,8 @@ func MakeAccountManager(ctx *cli.Context) *accounts.Manager {
 	// Assemble an account manager using the configured datadir
 	var (
 		datadir     = MustMakeDataDir(ctx)
-		keystore = crypto.NewKeyStorePassphrase(filepath.Join(datadir, "keystore"), scryptN, scryptP)
+		keystoredir = MakeKeyStoreDir(datadir, ctx)
+		keystore    = crypto.NewKeyStorePassphrase(keystoredir, scryptN, scryptP)
 	)
 	return accounts.NewManager(keystore)
 }