diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-08-13 18:23:20 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-08-13 18:23:20 +0300 |
| commit | 192a08def30f24a85ce7ce01bce73b64dc6a80ec (patch) | |
| tree | 505ab65674fe50bbc239cd9b157daf3433e6b904 /main/awall | |
| parent | 919cacad3be410e68d409ec9b89825a09b233170 (diff) | |
| download | aports-192a08def30f24a85ce7ce01bce73b64dc6a80ec.tar.bz2 aports-192a08def30f24a85ce7ce01bce73b64dc6a80ec.tar.xz | |
main/awall: setup-firewall: fix DHCP zones
Diffstat (limited to 'main/awall')
| -rw-r--r-- | main/awall/APKBUILD | 4 | ||||
| -rwxr-xr-x | main/awall/setup-firewall | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD index c8ee4d3289..dac864255d 100644 --- a/main/awall/APKBUILD +++ b/main/awall/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=awall pkgver=1.6.2 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine Wall" url="https://git.alpinelinux.org/cgit/awall/" _luaver=5.2 @@ -52,4 +52,4 @@ policies() { } sha512sums="85a64af6ce7db84e4926d62ea1586574839306aa3cfd52ced24fd98ad4cdf0241349f4bc1f647596b6f55d29bf0c78c7c793b8b858f0ea1fe9265f7f93fc9e48 awall-1.6.2.tar.xz -37380061c5e3499ba496ce427b8d0783029ef666ad726c392ae5c90f8e093c9ec462764b262406948b05dbc900e375e378a93268f0ebba502b0b419f6d2a885e setup-firewall" +32f421b97b0d5d8cda4aa66c5f02319ffef12368d2c4903dbe9f6f3feb48959f6624706083c89cc2cd0ce2878c1c3962b4b7f906713623fe66181d071db37f61 setup-firewall" diff --git a/main/awall/setup-firewall b/main/awall/setup-firewall index b4e776cbc3..0ba082b6a2 100755 --- a/main/awall/setup-firewall +++ b/main/awall/setup-firewall @@ -55,7 +55,7 @@ WAN_IFACE=$(ip route | sed -E 's/^default .+ dev ([^ ]+)( .*)?$/\1/;ta;d;:a') info "WAN interface" $WAN_IFACE DHCP_ZONES= -[ -f /var/run/udhcpc.$WAN_IFACE.pid ] && DHCP_ZONES=wan +[ -f /var/run/udhcpc.$WAN_IFACE.pid ] && DHCP_ZONES=adp-wan if is_running dhcpd; then LAN_IFACES=$(. /etc/conf.d/dhcpd && echo $DHCPD_IFACE) @@ -89,7 +89,7 @@ if [ "$LAN_IFACES" ]; then info "LAN interfaces" $LAN_IFACES info "LAN addresses" $LAN_ADDRS info "LAN private addresses" $LAN_PRIVATE_ADDRS - DHCP_ZONES="$DHCP_ZONES lan" + DHCP_ZONES="$DHCP_ZONES adp-lan" enable_policy router fi |