- disabled autostart and auto enable for iptables.service and ip6tables.service

for Fedora > 16
This commit is contained in:
Thomas Woerner 2012-02-15 19:52:36 +01:00
parent 0b45b2759a
commit 9b9f064100

View File

@ -15,7 +15,7 @@
Name: iptables Name: iptables
Summary: Tools for managing Linux kernel packet filtering capabilities Summary: Tools for managing Linux kernel packet filtering capabilities
Version: 1.4.12.2 Version: 1.4.12.2
Release: 1%{?dist} Release: 2%{?dist}
Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
Source1: iptables.init Source1: iptables.init
Source2: iptables-config Source2: iptables-config
@ -134,8 +134,10 @@ rm -rf %{buildroot}
/sbin/ldconfig /sbin/ldconfig
if [ $1 -eq 1 ] ; then # Initial installation if [ $1 -eq 1 ] ; then # Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1 || :
%if 0%{?fedora} > 16
/bin/systemctl enable iptables.service >/dev/null 2>&1 || : /bin/systemctl enable iptables.service >/dev/null 2>&1 || :
/bin/systemctl enable ip6tables.service >/dev/null 2>&1 || : /bin/systemctl enable ip6tables.service >/dev/null 2>&1 || :
%endif
fi fi
%preun %preun
@ -159,7 +161,9 @@ fi
%{_bindir}/systemd-sysv-convert --save iptables >/dev/null 2>&1 ||: %{_bindir}/systemd-sysv-convert --save iptables >/dev/null 2>&1 ||:
# Autostart # Autostart
%if 0%{?fedora} > 16
/bin/systemctl --no-reload enable iptables.service >/dev/null 2>&1 ||: /bin/systemctl --no-reload enable iptables.service >/dev/null 2>&1 ||:
%endif
# Delete from sysv management, try to restart service # Delete from sysv management, try to restart service
/sbin/chkconfig --del iptables >/dev/null 2>&1 || : /sbin/chkconfig --del iptables >/dev/null 2>&1 || :
@ -170,7 +174,9 @@ fi
%{_bindir}/systemd-sysv-convert --save ip6tables >/dev/null 2>&1 ||: %{_bindir}/systemd-sysv-convert --save ip6tables >/dev/null 2>&1 ||:
# Autostart # Autostart
%if 0%{?fedora} > 16
/bin/systemctl --no-reload enable ip6tables.service >/dev/null 2>&1 ||: /bin/systemctl --no-reload enable ip6tables.service >/dev/null 2>&1 ||:
%endif
# Delete from sysv management, try to restart service # Delete from sysv management, try to restart service
/sbin/chkconfig --del ip6tables >/dev/null 2>&1 || : /sbin/chkconfig --del ip6tables >/dev/null 2>&1 || :
@ -243,6 +249,10 @@ fi
%{_libdir}/pkgconfig/xtables.pc %{_libdir}/pkgconfig/xtables.pc
%changelog %changelog
* Wed Feb 15 2012 Thomas Woerner <twoerner@redhat.com> 1.4.12.2-2
- disabled autostart and auto enable for iptables.service and ip6tables.service
for Fedora > 16
* Mon Jan 16 2012 Thomas Woerner <twoerner@redhat.com> 1.4.12.2-1 * Mon Jan 16 2012 Thomas Woerner <twoerner@redhat.com> 1.4.12.2-1
- new version 1.4.12.2 with new pkgconfig/libip4tc.pc and pkgconfig/libip6tc.pc - new version 1.4.12.2 with new pkgconfig/libip4tc.pc and pkgconfig/libip6tc.pc
- build: make check stage not fail when building statically - build: make check stage not fail when building statically