From da0d58132b5b6cc408f9b94d9e7b9cb34a78d45e Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 2 Jul 2013 16:33:30 +0100
Subject: [PATCH] Set the grains file in the proper place if found on the
 provided temporary configuration directory.

Refs saltstack/salt#5849
Refs saltstack/salt-cloud#672
---
 bootstrap-salt.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 8c70de7..2abbc44 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2738,6 +2738,13 @@ config_salt() {
     [ -d $SALT_ETC_DIR ] || mkdir $SALT_ETC_DIR || return 1
     [ -d $PKI_DIR ] || mkdir -p $PKI_DIR && chmod 700 $PKI_DIR || return 1
 
+    # Copy the grains file if found
+    if [ -f "$TEMP_CONFIG_DIR/grains" ]; then
+        echodebug "Moving provided grains file from $TEMP_CONFIG_DIR/grains to $SALT_ETC_DIR/grains"
+        movefile "$TEMP_CONFIG_DIR/grains" "$SALT_ETC_DIR/grains" || return 1
+        CONFIGURED_ANYTHING=$BS_TRUE
+    fi
+
     if [ $INSTALL_MINION -eq $BS_TRUE ]; then
         # Create the PKI directory
         [ -d $PKI_DIR/minion ] || mkdir -p $PKI_DIR/minion && chmod 700 $PKI_DIR/minion || return 1