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>
(cherry picked from commit 17af33ee48bb709aec31d09b90cfbd4cbece6d0d)

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 9a1c9f22964cbb033779a7b4baa18c140f51987d..ce0fbae2a4ffe4f51ff0ca5819653c6321d3f4db 100644 (file)
--- 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 5d7888f765245dbbd3607558f08d83d4e6c204b2..ade9915b9129543eab23707217cf210ccec935c7 100644 (file)
--- 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" ],