From be5d207d5d27df5bdb5250fa96203a75cd3efc13 Mon Sep 17 00:00:00 2001
From: Josh Curl <josh@curl.me>
Date: Wed, 30 Nov 2016 16:41:58 -0800
Subject: [PATCH] Show SSH keys and hostname from metadata in 'ros config
 export'

---
 config/config.go | 2 +-
 config/disk.go   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/config.go b/config/config.go
index 8d24c3c5..259e7f0b 100644
--- a/config/config.go
+++ b/config/config.go
@@ -18,7 +18,7 @@ func Merge(bytes []byte) error {
 }
 
 func Export(private, full bool) (string, error) {
-	rawCfg := loadRawDiskConfig("", full)
+	rawCfg := loadRawConfig("", full)
 	if !private {
 		rawCfg = filterPrivateKeys(rawCfg)
 	}
diff --git a/config/disk.go b/config/disk.go
index 3651a3b2..c5a9ebf2 100644
--- a/config/disk.go
+++ b/config/disk.go
@@ -44,8 +44,8 @@ func loadRawDiskConfig(dirPrefix string, full bool) map[interface{}]interface{}
 	return util.Merge(rawCfg, additionalCfgs)
 }
 
-func loadRawConfig(dirPrefix string) map[interface{}]interface{} {
-	rawCfg := loadRawDiskConfig(dirPrefix, true)
+func loadRawConfig(dirPrefix string, full bool) map[interface{}]interface{} {
+	rawCfg := loadRawDiskConfig(dirPrefix, full)
 	rawCfg = util.Merge(rawCfg, readCmdline())
 	rawCfg = applyDebugFlags(rawCfg)
 	return mergeMetadata(rawCfg, readMetadata())
@@ -56,7 +56,7 @@ func LoadConfig() *CloudConfig {
 }
 
 func LoadConfigWithPrefix(dirPrefix string) *CloudConfig {
-	rawCfg := loadRawConfig(dirPrefix)
+	rawCfg := loadRawConfig(dirPrefix, true)
 
 	cfg := &CloudConfig{}
 	if err := util.Convert(rawCfg, cfg); err != nil {