From ed73090ea13eb6166da213670c101948c01b35ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 25 Sep 2013 12:39:11 +0200 Subject: [PATCH] Cronies systemd script use KillMode=process. rhbz#919290 --- cronie.spec | 5 ++++- unitfile-killprocess.patch | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 unitfile-killprocess.patch diff --git a/cronie.spec b/cronie.spec index 4c1820a..a4fefcd 100644 --- a/cronie.spec +++ b/cronie.spec @@ -8,6 +8,7 @@ Name: cronie Version: 1.4.11 Release: 4%{?dist} Patch0: correct-env.patch +Patch1: unitfile-killprocess.patch License: MIT and BSD and ISC and GPLv2+ Group: System Environment/Base URL: https://fedorahosted.org/cronie @@ -76,7 +77,8 @@ extra features. %prep %setup -q -%patch0 -p1 +%patch0 -p1 -b .jobenv +%patch1 -p1 %build %configure \ @@ -203,6 +205,7 @@ exit 0 %changelog * Wed Sep 25 2013 Marcela Mašláňová - 1.4.11-4 - some jobs are not executed because not all environment variables are set 995590 +- cronie's systemd script use "KillMode=process" 919290 * Sat Aug 03 2013 Fedora Release Engineering - 1.4.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/unitfile-killprocess.patch b/unitfile-killprocess.patch new file mode 100644 index 0000000..624d21c --- /dev/null +++ b/unitfile-killprocess.patch @@ -0,0 +1,11 @@ +diff -up cronie-1.4.11/contrib/cronie.systemd.old2 cronie-1.4.11/contrib/cronie.systemd +--- cronie-1.4.11/contrib/cronie.systemd.old2 2013-07-18 14:27:08.000000000 +0200 ++++ cronie-1.4.11/contrib/cronie.systemd 2013-09-25 12:36:10.129374891 +0200 +@@ -5,6 +5,7 @@ After=syslog.target auditd.service syste + [Service] + EnvironmentFile=/etc/sysconfig/crond + ExecStart=/usr/sbin/crond -n $CRONDARGS ++KillMode=process + + [Install] + WantedBy=multi-user.target