diff options
| author |   Peter Volkov <pva@gentoo.org> | 2008-05-04 13:16:40 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2008-05-04 13:16:40 +0000 |
| commit | 5231821a1d09c87f71ee7aec12fe4cfe4937400b (patch) | |
| tree | b58ccc53c6756aa3d1bc71d62b7498b4778b1475 /net-firewall | |
| parent | Update dependencies, bug #218767, thank Vieri <rentorbuy AT yahoo.com> for ma... (diff) | |
| download | gentoo-2-5231821a1d09c87f71ee7aec12fe4cfe4937400b.tar.gz gentoo-2-5231821a1d09c87f71ee7aec12fe4cfe4937400b.tar.bz2 gentoo-2-5231821a1d09c87f71ee7aec12fe4cfe4937400b.zip | |
Updated init.d script to fix reports of status, bug #219740, thank Vieri <rentorbuy AT yahoo.com> for maintaining!
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-firewall')
| -rw-r--r-- | net-firewall/shorewall-common/ChangeLog | 6 | ||||
| -rw-r--r-- | net-firewall/shorewall-common/files/shorewall.initd | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/net-firewall/shorewall-common/ChangeLog b/net-firewall/shorewall-common/ChangeLog index f23e0b9b20c7..512baa5867aa 100644 --- a/net-firewall/shorewall-common/ChangeLog +++ b/net-firewall/shorewall-common/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-firewall/shorewall-common # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/ChangeLog,v 1.13 2008/05/04 13:02:22 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/ChangeLog,v 1.14 2008/05/04 13:16:40 pva Exp $ + + 04 May 2008; Peter Volkov <pva@gentoo.org> files/shorewall.initd: + Updated init.d script to fix reports of status, bug #219740, thank Vieri + <rentorbuy AT yahoo.com> for maintaining! *shorewall-common-4.0.10.1 (04 May 2008) diff --git a/net-firewall/shorewall-common/files/shorewall.initd b/net-firewall/shorewall-common/files/shorewall.initd index 27efb064ed91..9dda676c574c 100644 --- a/net-firewall/shorewall-common/files/shorewall.initd +++ b/net-firewall/shorewall-common/files/shorewall.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/files/shorewall.initd,v 1.1 2007/09/06 11:16:44 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/files/shorewall.initd,v 1.2 2008/05/04 13:16:40 pva Exp $ opts="start stop restart clear reset refresh check" @@ -29,10 +29,15 @@ restart() { # here. Note that this comment is required to fix bug 55576; # runscript.sh greps this script... (09 Jul 2004 agriffis) ebegin "Restarting firewall" - if [ -f /var/lib/shorewall/restore ] ; then - /sbin/shorewall restore + /sbin/shorewall status >/dev/null + if [ $? != 0 ] ; then + svc_start else + if [ -f /var/lib/shorewall/restore ] ; then + /sbin/shorewall restore + else /sbin/shorewall restart 1>/dev/null + fi fi eend $? } |