save the keystore passphrase when agent.properties is missing on a new kvm host

Author: Damans227

scripts/util/keystore-setup

@@ -44,21 +44,25 @@ fi
 
 $LOGGER_CMD "$(date) - starting keystore-setup"
 
+# Create the props file if missing, so the new password can be saved
+if [ ! -f "$PROPS_FILE" ]; then
+    $LOGGER_CMD "Props file does not exist, creating it"
+    touch "$PROPS_FILE"
+    chmod 600 "$PROPS_FILE" || $LOGGER_CMD "Cannot chmod $PROPS_FILE"
+fi
+
 # Re-use existing password or use the one provided
-if [ -f "$PROPS_FILE" ]; then
-    $LOGGER_CMD "Previous props file exists, trying to extract password"
-    OLD_PASS=$(sed -n '/^keystore.passphrase/p' "$PROPS_FILE" | sed 's/^keystore.passphrase=//g')
-    if [ -n "${OLD_PASS// }" ]; then
-        KS_PASS="$OLD_PASS"
-        $LOGGER_CMD "Password extraction successful"
+OLD_PASS=$(sed -n '/^keystore.passphrase/p' "$PROPS_FILE" | sed 's/^keystore.passphrase=//g')
+if [ -n "${OLD_PASS// }" ]; then
+    KS_PASS="$OLD_PASS"
+    $LOGGER_CMD "Password extraction successful"
+else
+    sed -i "/^keystore.passphrase.*/d" "$PROPS_FILE" 2>&1 | $LOGGER_CMD || true
+    echo "keystore.passphrase=$KS_PASS" >> "$PROPS_FILE"
+    if [ $? != 0 ]; then
+            $LOGGER_CMD "Could not add new password to agent.properties"
     else
-        sed -i "/^keystore.passphrase.*/d" "$PROPS_FILE" 2>&1 | $LOGGER_CMD || true
-        echo "keystore.passphrase=$KS_PASS" >> "$PROPS_FILE"
-        if [ $? != 0 ]; then
-                $LOGGER_CMD "Could not add new password to agent.properties"
-        else
-                $LOGGER_CMD "New keystore password set"
-        fi
+            $LOGGER_CMD "New keystore password set"
     fi
 fi