From 224ebd305c43ba0e449f3321df915cc792882d05 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 30 Oct 2014 01:16:07 +0000 Subject: [PATCH] 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/"