From 224ebd305c43ba0e449f3321df915cc792882d05 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Thu, 30 Oct 2014 01:16:07 +0000
Subject: [PATCH 1/3] Apply the forking patch to openSUSE git installations.

This is needed while SuSE/openSUSE doesn't ship the systemd python
bindings.

Closes saltstack/salt#16982
---
 bootstrap-salt.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 8d57ef9..d52a469 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -3979,6 +3979,12 @@ install_opensuse_git_deps() {
 
     __git_clone_and_checkout || return 1
 
+    if [ -f "${__SALT_GIT_CHECKOUT_DIR}/pkg/suse/use-forking-daemon.patch" ]; then
+        cd "${__SALT_GIT_CHECKOUT_DIR}"
+        echowarn "Applying patch to systemd service unit file"
+        patch -p1 < pkg/suse/use-forking-daemon.patch || return 1
+    fi
+
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
         _TEMP_CONFIG_DIR="${__SALT_GIT_CHECKOUT_DIR}/conf/"

From 96bb6d90f603b91f83159bc87c271a11e54ecd97 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Thu, 30 Oct 2014 01:21:20 +0000
Subject: [PATCH 2/3] Update changes log

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 4417489..7c709e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Version 2014.10.30:
+	* Apply the forking patch to openSUSE git installations.
+
 Version 2014.10.28:
 	* Install the python systemd bindings for Arch and Fedora git installations
 	* Allow cloning from Salt's git repository using HTTPS. #475

From 534cd6856dae18791d237f80fc4ed23b64c0877a Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Thu, 30 Oct 2014 01:21:58 +0000
Subject: [PATCH 3/3] Bump version for stable release

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index d52a469..c97324b 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -17,7 +17,7 @@
 #       CREATED: 10/15/2012 09:49:37 PM WEST
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
-__ScriptVersion="2014.10.28"
+__ScriptVersion="2014.10.30"
 __ScriptName="bootstrap-salt.sh"
 
 #======================================================================================================================