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 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index a1b59fc..092a750 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" #====================================================================================================================== @@ -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/"