From: Adrian Schmutzler Date: Tue, 16 Jun 2020 12:46:42 +0000 (+0200) Subject: mediatek: fix IPv4-only corner case and commit in 99-net-ps X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=636b62e8e232951154ac4ccd7972fda3f8de0379;p=oweals%2Fopenwrt.git mediatek: fix IPv4-only corner case and commit in 99-net-ps The uci config section network.globals set up in /bin/config_generate will only be created if /proc/sys/net/ipv6 exists. Correspondingly, lacking IPv6 support, the command uci set network.globals.packet_steering=1 will fail with "uci: Invalid argument" as the network.globals config has not been set up. Fix that by adding the setup there as well. While at it, limit the uci commit to the network config file. Signed-off-by: Adrian Schmutzler --- diff --git a/target/linux/mediatek/base-files/etc/uci-defaults/99-net-ps b/target/linux/mediatek/base-files/etc/uci-defaults/99-net-ps index accb72916e..596b33c5b4 100755 --- a/target/linux/mediatek/base-files/etc/uci-defaults/99-net-ps +++ b/target/linux/mediatek/base-files/etc/uci-defaults/99-net-ps @@ -1,3 +1,4 @@ +uci set network.globals='globals' uci set network.globals.packet_steering=1 uci set network.eth0=device uci set network.eth0.name=eth0 @@ -9,5 +10,7 @@ uci set network.lan2=device uci set network.lan2.name=lan2 uci set network.lan3=device uci set network.lan3.name=lan3 -uci commit + +uci commit network + exit 0