X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5acb7ec58a5220ac99bbc6ca274bc698191fff49..271da7f4e93492f377c0fcf25def4591d60b9fbc:/package/firewall/files/firewall.hotplug?ds=sidebyside diff --git a/package/firewall/files/firewall.hotplug b/package/firewall/files/firewall.hotplug index bc75e42d1..720b34cc8 100644 --- a/package/firewall/files/firewall.hotplug +++ b/package/firewall/files/firewall.hotplug @@ -3,26 +3,20 @@ # HOTPLUG_TYPE=iface, triggered by various scripts when an interface # is configured (ACTION=ifup) or deconfigured (ACTION=ifdown). The # interface is available as INTERFACE, the real device as DEVICE. -. /etc/functions.sh [ "$DEVICE" == "lo" ] && exit 0 +. /etc/functions.sh . /lib/firewall/core.sh -fw_init -# Wait for firewall if startup is in progress -lock -w /var/lock/firewall.start +fw_init +fw_is_loaded || exit 0 case "$ACTION" in ifup) - fw_is_loaded && { - fw_configure_interface "$INTERFACE" add "$DEVICE" & - } || { - /etc/init.d/firewall enabled && fw_start & - } + fw_configure_interface "$INTERFACE" add "$DEVICE" & ;; ifdown) - fw_is_loaded && fw_configure_interface "$INTERFACE" del "$DEVICE" & + fw_configure_interface "$INTERFACE" del "$DEVICE" ;; esac -