From d1172d84fca15b224c7c4e769f53d6e4b109c316 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Wed, 11 May 2016 13:25:55 -0600
Subject: [PATCH 1/2] Only overwrite the minion config file if '-C' is passed.
 Otherwise, preserve it.

Fixes #830
---
 bootstrap-salt.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 2470193..e78ca88 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -5901,18 +5901,18 @@ config_salt() {
 
         # Copy the minions configuration if found
         if [ -f "$_TEMP_CONFIG_DIR/minion" ]; then
-            __movefile "$_TEMP_CONFIG_DIR/minion" "$_SALT_ETC_DIR" "$BS_TRUE" || return 1
+            __movefile "$_TEMP_CONFIG_DIR/minion" "$_SALT_ETC_DIR" "$_CONFIG_ONLY" || return 1
             CONFIGURED_ANYTHING=$BS_TRUE
         fi
 
         # Copy the minion's keys if found
         if [ -f "$_TEMP_CONFIG_DIR/minion.pem" ]; then
-            __movefile "$_TEMP_CONFIG_DIR/minion.pem" "$_PKI_DIR/minion/" "$BS_TRUE" || return 1
+            __movefile "$_TEMP_CONFIG_DIR/minion.pem" "$_PKI_DIR/minion/" "$_CONFIG_ONLY" || return 1
             chmod 400 "$_PKI_DIR/minion/minion.pem" || return 1
             CONFIGURED_ANYTHING=$BS_TRUE
         fi
         if [ -f "$_TEMP_CONFIG_DIR/minion.pub" ]; then
-            __movefile "$_TEMP_CONFIG_DIR/minion.pub" "$_PKI_DIR/minion/" "$BS_TRUE" || return 1
+            __movefile "$_TEMP_CONFIG_DIR/minion.pub" "$_PKI_DIR/minion/" "$_CONFIG_ONLY" || return 1
             chmod 664 "$_PKI_DIR/minion/minion.pub" || return 1
             CONFIGURED_ANYTHING=$BS_TRUE
         fi

From 51257497b6a1c48a094ffe84b190dce48d808ad8 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Wed, 11 May 2016 14:19:59 -0600
Subject: [PATCH 2/2] Update changelog and version for 2016.05.11 release

---
 ChangeLog         | 3 +++
 bootstrap-salt.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3f87574..30b0b9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Version 2016.05.11:
+    * Only overwrite the minion config file if '-C' is passed. Otherwise, preserve it. (rallytime) #848
+
 Version 2016.05.10:
     * Removed libzmq4 and forking-deamon-patch for Opensuse13. (jtand) #840
     * Ubuntu 12.04 needs to be updated before installing packages. (jtand) #829
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 2470193..a8f29cc 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -18,7 +18,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2016.05.10"
+__ScriptVersion="2016.05.11"
 __ScriptName="bootstrap-salt.sh"
 
 #======================================================================================================================