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 | 19d6e3f1274ea6fe18e9138322f383962826c43a (patch) | |
| tree | 831c8fa20ee8a51a6e155033aea1474f1cc4bcca /net-firewall/shorewall-common | |
| parent | Update dependencies, bug #218767, thank Vieri <rentorbuy AT yahoo.com> for ma... (diff) | |
| download | historical-19d6e3f1274ea6fe18e9138322f383962826c43a.tar.gz historical-19d6e3f1274ea6fe18e9138322f383962826c43a.tar.bz2 historical-19d6e3f1274ea6fe18e9138322f383962826c43a.zip | |
Updated init.d script to fix reports of status, bug #219740, thank Vieri <rentorbuy AT yahoo.com> for maintaining!
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-firewall/shorewall-common')
| -rw-r--r-- | net-firewall/shorewall-common/ChangeLog | 6 | ||||
| -rw-r--r-- | net-firewall/shorewall-common/Manifest | 4 | ||||
| -rw-r--r-- | net-firewall/shorewall-common/files/shorewall.initd | 11 |
3 files changed, 15 insertions, 6 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/Manifest b/net-firewall/shorewall-common/Manifest index 8f3c2c049852..bd3d2efc7aa3 100644 --- a/net-firewall/shorewall-common/Manifest +++ b/net-firewall/shorewall-common/Manifest @@ -1,4 +1,4 @@ -AUX shorewall.initd 1819 RMD160 ffa955b207646d171ac74a7b6e5abc7296c9641e SHA1 42d6b760ebd7ed758704df8e56740056b07b45be SHA256 cbebacb1f096285fb2d26313233031df62f593c767f16bc67001424e3996719f +AUX shorewall.initd 1912 RMD160 5766b04a72cea35869dc50d6a4652779e16b707b SHA1 f88025b4a9934dc938f6904df63c06da486bce34 SHA256 9678df49ead9a6a65f2f1dd002ff695b9e1bd88be145fe7c56e21738eab413b1 DIST shorewall-common-4.0.10.1.tar.bz2 138475 RMD160 e4de4becd04cee92ac063b2682cb490643ce224b SHA1 6d9418cd8b25928e386d068445a517f20ecfc008 SHA256 f18318a075dd580177e9c65dbdd0504e0b657dc151ed7ce6e75cfe771a98d220 DIST shorewall-common-4.0.10.tar.bz2 138385 RMD160 136df9ae2fa3c1f9c8e55ad154c1ce8a7f34ee79 SHA1 9cbbf976f6d1f408c903e88ca91e9ceb70969711 SHA256 6675009622903aba62a43943524dee5c42448ac8d0e729e93cbb4c124d222ead DIST shorewall-common-4.0.3.tar.bz2 127258 RMD160 d7894d7f5ce3f9b14645ef36b8b08f1f413cadf9 SHA1 45d864be4364cf861809860b37b893933f5f8c94 SHA256 05738d5c6c895f861d5946160c9f4daf8e8316a1fdbb222173c5f5fff133d314 @@ -13,5 +13,5 @@ EBUILD shorewall-common-4.0.10.ebuild 3750 RMD160 25716e4064f33379ab0235270c7e13 EBUILD shorewall-common-4.0.3.ebuild 3753 RMD160 d50ce831cfc5ff3c5d39804e016c06edd471006b SHA1 71cb139dcd1f9356e31682e5695f4f44262af268 SHA256 84f4259345bf2c5e7bb7a56f52823bdec27604226e485c343aaf125a4eb2d739 EBUILD shorewall-common-4.0.8.ebuild 3752 RMD160 77fd559994bcea49e807608fe9f4c6ac0ff6d247 SHA1 1136d52c5ddcebd48d34d064ad0781dd9b76a9a8 SHA256 989136e78d648daa8addda27394d9cc5e2ec1d8c042db836ee66f6a33a8ef7b3 EBUILD shorewall-common-4.0.9.ebuild 3696 RMD160 85b4299ada244b22f113375c61117f6be2631a93 SHA1 4e16628f34f69f15f85ed1b03305705e2692a6f3 SHA256 e995ee00abe8293ab2aab5e7ef233db6c29f59d6dcbe50a591a1305fc186d996 -MISC ChangeLog 2144 RMD160 08af3e5459e1981df2c39957cf97f995e85de4bb SHA1 4cc18b9b65b178ed9803b7c5e25306e3c61eea92 SHA256 5d3e18bb8eb3c59eb66e9f6685783a9b936e3cbbcb3de6ebcc9efbcc41208758 +MISC ChangeLog 2332 RMD160 b96bdffc525e56ba067b354d5fd213e0cabd6d37 SHA1 06756832f6bcb36e88f16e23bc98c7a7f639ae1c SHA256 358d00342fafdf7323ebf394eb467c6291b478af4480f4ecd487eb5b8282a202 MISC metadata.xml 306 RMD160 90a3e8c5e062df3f9292505b62d82b831bcaa1bd SHA1 47b37ae73a7a7bbf2f99307edaa7fed6fe77a799 SHA256 7f2b854d54b12215f518f9d8101dbe766e69976639f42caa2bd16e95739ae0e9 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 $? } |