packages: iptables/ip6tables.init, iptables/ip6tables.service, iptables/ipt...

[baggins]

Author: baggins                      Date: Wed Apr 18 10:06:27 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- silence systemd services startup

---- Files affected:
packages/iptables:
   ip6tables.init (1.19 -> 1.20) , ip6tables.service (1.1 -> 1.2) , iptables.init (1.16 -> 1.17) , iptables.service (1.1 -> 1.2) , iptables.spec (1.314 -> 1.315) 

---- Diffs:

================================================================
Index: packages/iptables/ip6tables.init
diff -u packages/iptables/ip6tables.init:1.19 packages/iptables/ip6tables.init:1.20
--- packages/iptables/ip6tables.init:1.19	Wed Apr 18 11:49:07 2012
+++ packages/iptables/ip6tables.init	Wed Apr 18 12:06:22 2012
@@ -44,6 +44,13 @@
 _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 "$@"

================================================================
Index: packages/iptables/ip6tables.service
diff -u packages/iptables/ip6tables.service:1.1 packages/iptables/ip6tables.service:1.2
--- packages/iptables/ip6tables.service:1.1	Wed Apr 18 11:33:43 2012
+++ packages/iptables/ip6tables.service	Wed Apr 18 12:06:22 2012
@@ -6,8 +6,8 @@
 [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
 

================================================================
Index: packages/iptables/iptables.init
diff -u packages/iptables/iptables.init:1.16 packages/iptables/iptables.init:1.17
--- packages/iptables/iptables.init:1.16	Wed Apr 18 11:49:07 2012
+++ packages/iptables/iptables.init	Wed Apr 18 12:06:22 2012
@@ -44,6 +44,13 @@
 _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 "$@"

================================================================
Index: packages/iptables/iptables.service
diff -u packages/iptables/iptables.service:1.1 packages/iptables/iptables.service:1.2
--- packages/iptables/iptables.service:1.1	Wed Apr 18 11:33:43 2012
+++ packages/iptables/iptables.service	Wed Apr 18 12:06:22 2012
@@ -6,8 +6,8 @@
 [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
 

================================================================
Index: packages/iptables/iptables.spec
diff -u packages/iptables/iptables.spec:1.314 packages/iptables/iptables.spec:1.315
--- packages/iptables/iptables.spec:1.314	Wed Apr 18 11:33:43 2012
+++ packages/iptables/iptables.spec	Wed Apr 18 12:06:22 2012
@@ -34,7 +34,7 @@
 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
@@ -272,7 +272,7 @@
 %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
@@ -464,6 +464,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.315  2012/04/18 10:06:22  baggins
+- silence systemd services startup
+
 Revision 1.314  2012/04/18 09:33:43  baggins
 - added systemd serices
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/iptables/ip6tables.init?r1=1.19&r2=1.20
    http://cvs.pld-linux.org/packages/iptables/ip6tables.service?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/iptables/iptables.init?r1=1.16&r2=1.17
    http://cvs.pld-linux.org/packages/iptables/iptables.service?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/iptables/iptables.spec?r1=1.314&r2=1.315