diff --git a/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js b/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js index 1dc5c6bff..0c575c416 100644 --- a/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js +++ b/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js @@ -330,7 +330,7 @@ return view.extend({ var e = map.querySelector('[id="cbi-network-%s"] .cbi-button-edit'.format(ifc.getName())); if (e) e.disabled = true; - var link = L.url('admin/system/opkg') + '?query=luci-proto'; + var link = L.url('admin/system/package-manager') + '?query=luci-proto'; dom.content(dsc, [ E('em', _('Unsupported protocol type.')), E('br'), E('a', { href: link }, _('Install protocol extensions...')) @@ -371,7 +371,6 @@ return view.extend({ network.getDSLModemType(), network.getDevices(), fs.lines('/etc/iproute2/rt_tables'), - L.resolveDefault(fs.read('/usr/lib/opkg/info/netifd.control')), uci.changes() ]); }, @@ -471,14 +470,10 @@ return view.extend({ }, render: function(data) { - var netifdVersion = (data[3] || '').match(/Version: ([^\n]+)/); - - if (netifdVersion && netifdVersion[1] >= "2021-05-26") { - if (this.interfaceBridgeWithIfnameSections().length) - return this.renderBridgeMigration(); - else if (this.deviceWithIfnameSections().length || this.interfaceWithIfnameSections().length) - return this.renderIfnameMigration(); - } + if (this.interfaceBridgeWithIfnameSections().length) + return this.renderBridgeMigration(); + else if (this.deviceWithIfnameSections().length || this.interfaceWithIfnameSections().length) + return this.renderIfnameMigration(); var dslModemType = data[0], netDevs = data[1], diff --git a/luci-mod-network/root/usr/share/rpcd/acl.d/luci-mod-network.json b/luci-mod-network/root/usr/share/rpcd/acl.d/luci-mod-network.json index 40ad05bc8..96a0d5ccf 100644 --- a/luci-mod-network/root/usr/share/rpcd/acl.d/luci-mod-network.json +++ b/luci-mod-network/root/usr/share/rpcd/acl.d/luci-mod-network.json @@ -8,7 +8,6 @@ "/proc/sys/net/ipv6/conf/*/mtu": [ "read" ], "/proc/sys/net/ipv6/conf/*/hop_limit": [ "read" ], "/usr/libexec/luci-peeraddr": [ "exec" ], - "/usr/lib/opkg/info/netifd.control": [ "read" ], "/proc/sys/net/ipv[46]/conf/*": [ "read" ], "/sys/class/net/*/brport/*": [ "read" ] },