* luci/libs/uvl: add missing username, password and server options to network schame, fix c-n-p errors

1 files changed, 24 insertions, 9 deletions

diff --git a/libs/uvl/root/lib/uci/schema/default/network b/libs/uvl/root/lib/uci/schema/default/network
index da9eb133c..0c5e993b9 100644
--- a/libs/uvl/root/lib/uci/schema/default/network
+++ b/libs/uvl/root/lib/uci/schema/default/network
@@ -28,6 +28,12 @@ config variable
 	option datatype	'macaddr'
 
 config variable
+	option name	'mtu'
+	option title	'MTU'
+	option section	'network.interface'
+	option datatype	'uint'
+
+config variable
 	option name	'ipaddr'
 	option title	'IPv4 host address'
 	option section	'network.interface'
@@ -70,12 +76,6 @@ config variable
 	option datatype	'ipaddr'
 
 config variable
-	option name	'mtu'
-	option title	'MTU'
-	option section	'network.interface'
-	option datatype	'uint'
-
-config variable
 	option name	'keepalive'
 	option title	'Number of connection failures before reconnect (PPTP)'
 	option section	'network.interface'
@@ -88,6 +88,24 @@ config variable
 	option datatype	'uint'
 
 config variable
+	option name	'username'
+	option title	'PPTP username'
+	option section	'network.interface'
+	option datatype	'string'
+
+config variable
+	option name	'password'
+	option title	'PPTP password'
+	option section	'network.interface'
+	option datatype	'string'
+
+config variable
+	option name	'server'
+	option title	'PPTP server'
+	option section	'network.interface'
+	option datatype	'ipaddr'
+
+config variable
 	option name	'proto'
 	option title	'Option proto'
 	option section	'network.interface'
@@ -133,9 +151,6 @@ config section
 	option package	'network'
 	list   depends	'proto=static, ipaddr, netmask'
 	list   depends	'proto=static, ip6addr'
-	list   depends	'proto=pppoe, username, password'
-	list   depends	'proto=pptp, username, password, server'
-	list   depends	'proto=dhcp'
 	option named	true
 
 config variable