From 9f90d1abd46cffab0117aa0cd6e731391bb6023a Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Mon, 4 May 2020 00:43:17 +0800 Subject: [PATCH 1/2] Redmi AC2100: adjust switch configuration (#4528) --- target/linux/ramips/mt7621/base-files/etc/board.d/02_network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index 43d3b1a9a9..d47d15f580 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -153,7 +153,7 @@ ramips_setup_interfaces() ;; xiaomi,redmi-router-ac2100) ucidef_add_switch "switch0" \ - "1:lan:2" "2:lan:3" "3:lan:4" "0:wan" "6@eth0" + "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0" ;; *) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" From d71dc69844e056a5fcefd27b7f00ce65648184da Mon Sep 17 00:00:00 2001 From: LitingLin Date: Mon, 4 May 2020 10:55:07 +0800 Subject: [PATCH 2/2] make compatible with new upstream Luci requirement (#4529) --- package/lean/luci-app-arpbind/Makefile | 2 +- .../root/usr/share/rpcd/acl.d/luci-app-arpbind.json | 11 +++++++++++ package/lean/luci-app-zerotier/Makefile | 2 +- .../root/usr/share/rpcd/acl.d/luci-app-zerotier.json | 11 +++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 package/lean/luci-app-arpbind/root/usr/share/rpcd/acl.d/luci-app-arpbind.json create mode 100644 package/lean/luci-app-zerotier/root/usr/share/rpcd/acl.d/luci-app-zerotier.json diff --git a/package/lean/luci-app-arpbind/Makefile b/package/lean/luci-app-arpbind/Makefile index e48ce83c58..9faabaed20 100755 --- a/package/lean/luci-app-arpbind/Makefile +++ b/package/lean/luci-app-arpbind/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=ARP Binding LUCI_DEPENDS:=+ip-full LUCI_PKGARCH:=all PKG_VERSION:=1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-arpbind/root/usr/share/rpcd/acl.d/luci-app-arpbind.json b/package/lean/luci-app-arpbind/root/usr/share/rpcd/acl.d/luci-app-arpbind.json new file mode 100644 index 0000000000..19bc1f230a --- /dev/null +++ b/package/lean/luci-app-arpbind/root/usr/share/rpcd/acl.d/luci-app-arpbind.json @@ -0,0 +1,11 @@ +{ + "luci-app-arpbind": { + "description": "Grant UCI access for luci-app-arpbind", + "read": { + "uci": [ "arpbind" ] + }, + "write": { + "uci": [ "arpbind" ] + } + } +} diff --git a/package/lean/luci-app-zerotier/Makefile b/package/lean/luci-app-zerotier/Makefile index 61d1f826ac..6275fce41a 100644 --- a/package/lean/luci-app-zerotier/Makefile +++ b/package/lean/luci-app-zerotier/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=LuCI for Zerotier LUCI_DEPENDS:=+zerotier LUCI_PKGARCH:=all PKG_VERSION:=1.0 -PKG_RELEASE:=18 +PKG_RELEASE:=19 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-zerotier/root/usr/share/rpcd/acl.d/luci-app-zerotier.json b/package/lean/luci-app-zerotier/root/usr/share/rpcd/acl.d/luci-app-zerotier.json new file mode 100644 index 0000000000..2724e99bfd --- /dev/null +++ b/package/lean/luci-app-zerotier/root/usr/share/rpcd/acl.d/luci-app-zerotier.json @@ -0,0 +1,11 @@ +{ + "luci-app-zerotier": { + "description": "Grant UCI access for luci-app-zerotier", + "read": { + "uci": [ "zerotier" ] + }, + "write": { + "uci": [ "zerotier" ] + } + } +}