From ec24c682b8276a54273a0bdb651b2a8185caec34bf9b432da6084fe9ef1ac857 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Mon, 29 Feb 2016 10:00:54 +0000 Subject: [PATCH] Accepting request 362864 from home:markoschandras:branches:security:netfilter Set DISABLE_RESTART_ON_UPDATE to yes instead of 1 OBS-URL: https://build.opensuse.org/request/show/362864 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/firewalld?expand=0&rev=6 --- firewalld.changes | 8 ++++++++ firewalld.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/firewalld.changes b/firewalld.changes index 6b6ee16..9a4d02e 100644 --- a/firewalld.changes +++ b/firewalld.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Feb 29 09:39:27 UTC 2016 - mchandras@suse.de + +- Set DISABLE_RESTART_ON_UPDATE to 'yes' instead of '1'. The macros in + /etc/rpm/macros.systemd only check for the 'yes' value so fix it to + properly prevent the firewalld service from being restarted during + updates. + ------------------------------------------------------------------- Mon Feb 22 13:18:19 UTC 2016 - mchandras@suse.de diff --git a/firewalld.spec b/firewalld.spec index 518d42c..fb2648f 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -126,7 +126,7 @@ install -D -m644 config/macros.firewalld %{buildroot}%{_sysconfdir}/rpm/macros.f # made it permanent yet so restarting the service could be # dangerous. It's safer to not touch the firewall ourselves but # Let the user restart it whenever he feels like it. -export DISABLE_RESTART_ON_UPDATE=1 +export DISABLE_RESTART_ON_UPDATE=yes %service_del_postun firewalld.service %post -n firewall-applet