protocols: fix interface.ipv6 vs. device.ipv6 option conflict

Ref: https://forum.openwrt.org/t/pppoe-disable-ipv6/92548
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js b/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
index 12acb74d9f06e8c5414918af73a0f9844f3156ed..7dab110207733cd9b5cbf0bbe8a445f50d3642cb 100644 (file)
--- a/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
+++ b/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
@@ -102,7 +102,8 @@ return network.registerProtocol('3g', {
                o.placeholder = '*99***1#';
 
                if (L.hasSystemFeature('ipv6')) {
-                       o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'));
+                       o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'));
+                       o.ucioption = 'ipv6';
                        o.value('auto', _('Automatic'));
                        o.value('0', _('Disabled'));
                        o.value('1', _('Manual'));

diff --git a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
index 8496b7de3c84ad770cf8e6d21d00770eaf0d8716..3195592d97ac86f31905e093b640f8c691b4176f 100644 (file)
--- a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
+++ b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
@@ -94,7 +94,8 @@ return network.registerProtocol('ncm', {
                o.placeholder = '*99***1#';
 
                if (L.hasSystemFeature('ipv6')) {
-                       o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'));
+                       o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'));
+                       o.ucioption = 'ipv6';
                        o.value('auto', _('Automatic'));
                        o.value('0', _('Disabled'));
                        o.value('1', _('Manual'));

diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js
index 4ea0e2f7d0f9d1bfefff6b3ab18f53e1a7e1593e..4cf4d8270109dc201e246203dbd37c76979da5ba 100644 (file)
--- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js
@@ -46,7 +46,8 @@ return network.registerProtocol('l2tp', {
                o.password = true;
 
                if (L.hasSystemFeature('ipv6')) {
-                       o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+                       o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+                       o.ucioption = 'ipv6';
                        o.value('auto', _('Automatic'));
                        o.value('0', _('Disabled'));
                        o.value('1', _('Manual'));

diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js
index f5a484f3578288088006780b7b07a800ee9262b5..6df468f9e34a815981c16f8d4d5c0ba41b9ecccd 100644 (file)
--- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js
@@ -90,7 +90,8 @@ return network.registerProtocol('ppp', {
                o.password = true;
 
                if (L.hasSystemFeature('ipv6')) {
-                       o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+                       o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+                       o.ucioption = 'ipv6';
                        o.value('auto', _('Automatic'));
                        o.value('0', _('Disabled'));
                        o.value('1', _('Manual'));

diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js
index 495a581a6c4be6e319e9ed127b5767d35871a309..ef2b18d62c3791628d74c11eb5223c816fb0d4d9 100644 (file)
--- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js
@@ -77,7 +77,8 @@ return network.registerProtocol('pppoa', {
                o.password = true;
 
                if (L.hasSystemFeature('ipv6')) {
-                       o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+                       o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+                       o.ucioption = 'ipv6';
                        o.value('auto', _('Automatic'));
                        o.value('0', _('Disabled'));
                        o.value('1', _('Manual'));

diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js
index 9ec2a81d3e59671f09c398b5296e6c7c6431c9da..02798308995ea7fc3056e34cf4efe57a7f1f042b 100644 (file)
--- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js
@@ -51,7 +51,8 @@ return network.registerProtocol('pppoe', {
                o.placeholder = _('auto');
 
                if (L.hasSystemFeature('ipv6')) {
-                       o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+                       o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+                       o.ucioption = 'ipv6';
                        o.value('auto', _('Automatic'));
                        o.value('0', _('Disabled'));
                        o.value('1', _('Manual'));

diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js
index 871fb34b4cd9b0f0332568846d1db9c1830746eb..9ae683a2964b133c0cc431fc8f7a3ff7878e2fa3 100644 (file)
--- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js
@@ -64,7 +64,8 @@ return network.registerProtocol('pptp', {
                o.password = true;
 
                if (L.hasSystemFeature('ipv6')) {
-                       o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+                       o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+                       o.ucioption = 'ipv6';
                        o.value('auto', _('Automatic'));
                        o.value('0', _('Disabled'));
                        o.value('1', _('Manual'));

diff --git a/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js b/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js
index 3c233f1e1bd35750b47d46b94a6395d57fe46f98..54035eb23ef0d2f6186913607d911783fe87862f 100644 (file)
--- a/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js
+++ b/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js
@@ -90,7 +90,8 @@ return network.registerProtocol('pppossh', {
                o.datatype = 'ipaddr("nomask")';
 
                if (L.hasSystemFeature('ipv6')) {
-                       o = s.taboption('advanced', form.Flag, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+                       o = s.taboption('advanced', form.Flag, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+                       o.ucioption = 'ipv6';
                        o.default = o.disabled;
                }
 

diff --git a/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js b/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js
index 6a8c2b6ac5179a0e21f4b5b362072e72f4537ace..de5bf493515995c9372640cdaac54fe9261f2c6e 100644 (file)
--- a/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js
+++ b/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js
@@ -86,7 +86,8 @@ return network.registerProtocol('qmi', {
                o.password = true;
 
                if (L.hasSystemFeature('ipv6')) {
-                       o = s.taboption('advanced', form.Flag, 'ipv6', _('Enable IPv6 negotiation'));
+                       o = s.taboption('advanced', form.Flag, 'ppp_ipv6', _('Enable IPv6 negotiation'));
+                       o.ucioption = 'ipv6';
                        o.default = o.disabled;
                }
 

diff --git a/protocols/luci-proto-sstp/htdocs/luci-static/resources/protocol/sstp.js b/protocols/luci-proto-sstp/htdocs/luci-static/resources/protocol/sstp.js
index b568f17018fe00cc9ddc28bc07cf930bfdd3044a..6a23407b50950f31ac1970057130c0efe804b58c 100644 (file)
--- a/protocols/luci-proto-sstp/htdocs/luci-static/resources/protocol/sstp.js
+++ b/protocols/luci-proto-sstp/htdocs/luci-static/resources/protocol/sstp.js
@@ -48,7 +48,8 @@ return network.registerProtocol('sstp', {
 
                // -- advanced --------------------------------------------------------------------
 
-               o = s.taboption('advanced', form.Flag, 'ipv6', _('IPv6 support'), _('If checked, adds "+ipv6" to the pppd options'));
+               o = s.taboption('advanced', form.Flag, 'ppp_ipv6', _('IPv6 support'), _('If checked, adds "+ipv6" to the pppd options'));
+               o.ucioption = 'ipv6';
 
                o = s.taboption('advanced', form.ListValue, 'log_level', _('sstpc Log-level'));
                o.value('0', _('0', 'sstp log level value'));