Archives
Archives
| From: | "Peter Volkov (pva)" <pva@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in net-firewall/shorewall-common/files: shorewall.initd |
| Date: | Sun, 04 May 2008 13:16:43 |
| Message-Id: | E1Jse53-0002Fq-0f@stork.gentoo.org |
| 1 | pva 08/05/04 13:16:41 |
| 2 | |
| 3 | Modified: shorewall.initd |
| 4 | Log: |
| 5 | Updated init.d script to fix reports of status, bug #219740, thank Vieri <rentorbuy AT yahoo.com> for maintaining! |
| 6 | (Portage version: 2.1.4.4) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.2 net-firewall/shorewall-common/files/shorewall.initd |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/shorewall-common/files/shorewall.initd?rev=1.2&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/shorewall-common/files/shorewall.initd?rev=1.2&content-type=text/plain |
| 13 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/shorewall-common/files/shorewall.initd?r1=1.1&r2=1.2 |
| 14 | |
| 15 | Index: shorewall.initd |
| 16 | =================================================================== |
| 17 | RCS file: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/files/shorewall.initd,v |
| 18 | retrieving revision 1.1 |
| 19 | retrieving revision 1.2 |
| 20 | diff -u -r1.1 -r1.2 |
| 21 | --- shorewall.initd 6 Sep 2007 11:16:44 -0000 1.1 |
| 22 | +++ shorewall.initd 4 May 2008 13:16:40 -0000 1.2 |
| 23 | @@ -1,7 +1,7 @@ |
| 24 | #!/sbin/runscript |
| 25 | # Copyright 1999-2006 Gentoo Foundation |
| 26 | # Distributed under the terms of the GNU General Public License v2 |
| 27 | -# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/files/shorewall.initd,v 1.1 2007/09/06 11:16:44 jokey Exp $ |
| 28 | +# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/files/shorewall.initd,v 1.2 2008/05/04 13:16:40 pva Exp $ |
| 29 | |
| 30 | opts="start stop restart clear reset refresh check" |
| 31 | |
| 32 | @@ -29,10 +29,15 @@ |
| 33 | # here. Note that this comment is required to fix bug 55576; |
| 34 | # runscript.sh greps this script... (09 Jul 2004 agriffis) |
| 35 | ebegin "Restarting firewall" |
| 36 | - if [ -f /var/lib/shorewall/restore ] ; then |
| 37 | - /sbin/shorewall restore |
| 38 | + /sbin/shorewall status >/dev/null |
| 39 | + if [ $? != 0 ] ; then |
| 40 | + svc_start |
| 41 | else |
| 42 | + if [ -f /var/lib/shorewall/restore ] ; then |
| 43 | + /sbin/shorewall restore |
| 44 | + else |
| 45 | /sbin/shorewall restart 1>/dev/null |
| 46 | + fi |
| 47 | fi |
| 48 | eend $? |
| 49 | } |
| 50 | |
| 51 | |
| 52 | |
| 53 | -- |
| 54 | gentoo-commits@l.g.o mailing list |