diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2021-05-26 13:25:24 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2021-05-26 13:29:55 +0200 |
| commit | 17af33ee48bb709aec31d09b90cfbd4cbece6d0d (patch) | |
| tree | 29ade8d367768e83fbd2a7af81fa8d7fdfff59d9 /modules | |
| parent | b8acde7f480a18343ee1f9624b790595065613ae (diff) | |
luci-mod-network: migrate network config depending on netifd version
Checking netifd version is important for users of the most recent LuCI
that didn't update netifd (e.g. OpenWrt package).
Suggested-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js | 8 | ||||
| -rw-r--r-- | modules/luci-mod-network/root/usr/share/rpcd/acl.d/luci-mod-network.json | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js index a1def24b07..e3502c0528 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js @@ -294,6 +294,7 @@ return view.extend({ network.getDSLModemType(), network.getDevices(), fs.lines('/etc/iproute2/rt_tables'), + fs.read('/usr/lib/opkg/info/netifd.control'), uci.changes() ]); }, @@ -354,8 +355,11 @@ return view.extend({ }, render: function(data) { - if (this.interfaceWithIfnameSections().length || - this.deviceWithIfnameSections().length) + var netifdVersion = (data[3] || '').match(/Version: ([^\n]+)/); + + if (netifdVersion && netifdVersion[1] >= "2021-05-20" && + (this.interfaceWithIfnameSections().length || + this.deviceWithIfnameSections().length)) return this.renderMigration(); var dslModemType = data[0], diff --git a/modules/luci-mod-network/root/usr/share/rpcd/acl.d/luci-mod-network.json b/modules/luci-mod-network/root/usr/share/rpcd/acl.d/luci-mod-network.json index 5d7888f765..ade9915b91 100644 --- a/modules/luci-mod-network/root/usr/share/rpcd/acl.d/luci-mod-network.json +++ b/modules/luci-mod-network/root/usr/share/rpcd/acl.d/luci-mod-network.json @@ -5,7 +5,8 @@ "cgi-io": [ "exec" ], "file": { "/etc/iproute2/rt_tables": [ "read" ], - "/usr/libexec/luci-peeraddr": [ "exec" ] + "/usr/libexec/luci-peeraddr": [ "exec" ], + "/usr/lib/opkg/info/netifd.control": [ "read" ] }, "ubus": { "file": [ "exec" ], |