- silence systemd services startup

Changed files:
    ip6tables.init -> 1.20
    ip6tables.service -> 1.2
    iptables.init -> 1.17
    iptables.service -> 1.2
    iptables.spec -> 1.315

diff --git a/ip6tables.init b/ip6tables.init
index 08adc8041808a1033cd8d52a2451ba59cacd058d..c181a1815d19dc070dc6bc36a8d51f5319b9cf71 100644 (file)
--- a/ip6tables.init
+++ b/ip6tables.init
@@ -44,6 +44,13 @@ IP6TABLES_STATUS_LINENUMBERS="yes"
 _SAVEOPT=
 is_yes $IP6TABLES_SAVE_COUNTER && _SAVEOPT="-c"
 
+if [ "$1" = "--quiet" ]; then
+       shift
+       show() { return 0; }
+       ok() { return 0; }
+       fail() { return 1; }
+fi
+
 iftable() {
        if fgrep -qsx $1 /proc/net/ip6_tables_names; then
                ip6tables -t "$@"

diff --git a/ip6tables.service b/ip6tables.service
index 4056092e7f2aa3d68d15293d92002d8504b82470..1046413d0c0b0b3609900eb7c50e2da8fe8b4287 100644 (file)
--- a/ip6tables.service
+++ b/ip6tables.service
@@ -6,8 +6,8 @@ ConditionPathExists=/etc/sysconfig/ip6tables
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/etc/rc.d/init.d/ip6tables start
-ExecStop=/etc/rc.d/init.d/ip6tables stop
+ExecStart=/etc/rc.d/init.d/ip6tables --quiet start
+ExecStop=/etc/rc.d/init.d/ip6tables --quiet stop
 StandardOutput=syslog
 StandardError=syslog
 

diff --git a/iptables.init b/iptables.init
index 8b0df55b455841f97f37842ebbeeea64e5270b90..68f3c9755d0806d806eee0bd7ff2d0f2f4ebdb32 100644 (file)
--- a/iptables.init
+++ b/iptables.init
@@ -44,6 +44,13 @@ IPTABLES_STATUS_LINENUMBERS="yes"
 _SAVEOPT=
 is_yes $IPTABLES_SAVE_COUNTER && _SAVEOPT="-c"
 
+if [ "$1" = "--quiet" ]; then
+       shift
+       show() { return 0; }
+       ok() { return 0; }
+       fail() { return 1; }
+fi
+
 iftable() {
        if fgrep -qsx $1 /proc/net/ip_tables_names; then
                iptables -t "$@"

diff --git a/iptables.service b/iptables.service
index 659f0393619d274d6afb23a5db75d1784f85412d..b9037ceef6d2be4300ce1baab4d0b3bee4b25819 100644 (file)
--- a/iptables.service
+++ b/iptables.service
@@ -6,8 +6,8 @@ ConditionPathExists=/etc/sysconfig/iptables
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/etc/rc.d/init.d/iptables start
-ExecStop=/etc/rc.d/init.d/iptables stop
+ExecStart=/etc/rc.d/init.d/iptables --quiet start
+ExecStop=/etc/rc.d/init.d/iptables --quiet stop
 StandardOutput=syslog
 StandardError=syslog
 

diff --git a/iptables.spec b/iptables.spec
index f524b93996406b6c1fd312f5b9a6c3065d9a1c4b..9c33489d506c120dfac189fd8db4dd0e4d188bc7 100644 (file)
--- a/iptables.spec
+++ b/iptables.spec
@@ -33,7 +33,7 @@ Summary(uk.UTF-8):    Утиліти для керування пакетними 
 Summary(zh_CN.UTF-8):  Linux内核包过滤管理工具
 Name:          iptables
 Version:       1.4.13
-Release:       1
+Release:       1.2
 License:       GPL v2
 Group:         Networking/Admin
 Source0:       ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2
@@ -271,7 +271,7 @@ fi
 %postun init
 %systemd_reload
 
-%triggerpostun init -- %{name}-init < 1.4.13-2
+%triggerpostun init -- %{name}-init < 1.4.13-1.1
 %systemd_trigger %{name}.service %{name6}.service
 
 %files