Re: [OpenWrt-Devel] [PATCH/resend] [odhcp6c] script: only call firewall, if installed

2015-05-31 Thread Bastian Bittorf 
* Steven Barth cy...@openwrt.org [31.05.2015 20:56]:
 The patch is malformed and cannot be applied.

i just sent a rebased version (the old was from 2014).

bye, bastian
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH/resend] [odhcp6c] script: only call firewall, if installed

2015-05-31 Thread Bastian Bittorf 
* Bastian Bittorf bitt...@bluebottle.com [23.10.2014 11:28]:
 odhcp6c: script: only call firewall, if installed
 
 we dont use fw3, so i was wondering about error-messages in syslog
 about fw3. check if 'fw3' is in place, before calling it.
 
 Signed-off-by: Bastian Bittorf bitt...@bluebottle.com
 ---
  package/network/ipv6/odhcp6c/files/dhcpv6.script |4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script 
 b/package/network/ipv6/odhcp6c/files/dhcpv6.script
 index 1acad19..6c47132 100755
 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
 +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
 @@ -111,7 +111,9 @@ setup_interface () {
   MAPRULE=$LW4O6
   fi
  
 - [ -n $ZONE ] || ZONE=$(fw3 -q network $INTERFACE)
 + [ -z $ZONE ]  {
 + [ -e '/sbin/fw3' ]  ZONE=$(fw3 -q network $INTERFACE)
 + }
  
   if [ $IFACE_MAP != 0 -a -n $MAPTYPE -a -n $MAPRULE ]; then
   [ -z $IFACE_MAP -o $IFACE_MAP = 1 ]  
 IFACE_MAP=${INTERFACE}_map
 -- 
 1.7.10.4
 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH/resend] [odhcp6c] script: only call firewall, if installed

2015-05-31 Thread Steven Barth 

The patch is malformed and cannot be applied.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH/resend] [odhcp6c] script: only call firewall, if installed

2014-10-23 Thread Bastian Bittorf 
odhcp6c: script: only call firewall, if installed

we dont use fw3, so i was wondering about error-messages in syslog
about fw3. check if 'fw3' is in place, before calling it.

Signed-off-by: Bastian Bittorf bitt...@bluebottle.com
---
 package/network/ipv6/odhcp6c/files/dhcpv6.script |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script 
b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index 1acad19..6c47132 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -111,7 +111,9 @@ setup_interface () {
MAPRULE=$LW4O6
fi
 
-   [ -n $ZONE ] || ZONE=$(fw3 -q network $INTERFACE)
+   [ -z $ZONE ]  {
+   [ -e '/sbin/fw3' ]  ZONE=$(fw3 -q network $INTERFACE)
+   }
 
if [ $IFACE_MAP != 0 -a -n $MAPTYPE -a -n $MAPRULE ]; then
[ -z $IFACE_MAP -o $IFACE_MAP = 1 ]  
IFACE_MAP=${INTERFACE}_map
-- 
1.7.10.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel