[iptables] remove scriptlets for migrating to a systemd unit from a SysV initscripts

Jiří Popelka jpopelka at fedoraproject.org
Thu Jan 9 15:56:04 UTC 2014


commit 9832ccc0c7c6f4bd035c946b7815edd7a8720744
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Jan 9 16:17:42 2014 +0100

    remove scriptlets for migrating to a systemd unit from a SysV initscripts
    
    https://lists.fedoraproject.org/pipermail/devel/2013-June/184271.html

 iptables.spec |   19 +------------------
 1 files changed, 1 insertions(+), 18 deletions(-)
---
diff --git a/iptables.spec b/iptables.spec
index 8a44156..46e11c3 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -56,7 +56,6 @@ Summary: iptables and ip6tables services for iptables
 Group: System Environment/Base
 Requires: %{name} = %{version}-%{release}
 Requires(post): systemd
-Requires(post): systemd-sysv
 Requires(preun): systemd
 Requires(postun): systemd
 Conflicts: systemd < 38
@@ -157,23 +156,6 @@ rm -rf %{buildroot}
 /sbin/ldconfig
 %systemd_postun_with_restart iptables.service ip6tables.service
 
-%triggerun -- iptables < 1.4.11.1-3
-# To apply saved runlevel, use systemd-sysv-convert --apply iptables
-%{_bindir}/systemd-sysv-convert --save iptables >/dev/null 2>&1 ||:
-
-# Delete from sysv management, try to restart service
-/sbin/chkconfig --del iptables >/dev/null 2>&1 || :
-/bin/systemctl try-restart iptables.service >/dev/null 2>&1 || :
-
-%triggerun -- iptables-ipv6 < 1.4.11.1-3
-# To apply saved runlevel, use systemd-sysv-convert --apply iptables
-%{_bindir}/systemd-sysv-convert --save ip6tables >/dev/null 2>&1 ||:
-
-# Delete from sysv management, try to restart service
-/sbin/chkconfig --del ip6tables >/dev/null 2>&1 || :
-/bin/systemctl try-restart ip6tables.service >/dev/null 2>&1 || :
-
-
 %files
 %defattr(-,root,root)
 %doc COPYING INCOMPATIBILITIES
@@ -230,6 +212,7 @@ rm -rf %{buildroot}
 * Thu Jan 09 2014 Jiri Popelka <jpopelka at redhat.com> - 1.4.21-3
 - no need to support the pre-systemd things
 - use systemd macros (#850166)
+- remove scriptlets for migrating to a systemd unit from a SysV initscripts
 
 * Thu Jan  9 2014 Thomas Woerner <twoerner at redhat.com> 1.4.21-2
 - fixed system hang at shutdown if root device is network based (RHBZ#1007934)


More information about the scm-commits mailing list