diff --git a/package/emortal/autocore/files/arm/rpcd_10_system.js b/package/emortal/autocore/files/arm/rpcd_10_system.js index d2e235ec33..729a648885 100644 --- a/package/emortal/autocore/files/arm/rpcd_10_system.js +++ b/package/emortal/autocore/files/arm/rpcd_10_system.js @@ -75,6 +75,7 @@ return baseclass.extend({ _('Hostname'), boardinfo.hostname, _('Model'), boardinfo.model + cpubench.cpubench, _('Architecture'), cpuinfo.cpuinfo, + _('Target Platform'), (L.isObject(boardinfo.release) ? boardinfo.release.target : ''), _('Firmware Version'), (L.isObject(boardinfo.release) ? boardinfo.release.description + ' / ' : '') + (luciversion || ''), _('Kernel Version'), boardinfo.kernel, _('Local Time'), datestr, diff --git a/package/emortal/autocore/files/arm/rpcd_luci b/package/emortal/autocore/files/arm/rpcd_luci index 5ac633730d..fdefb2dbed 100755 --- a/package/emortal/autocore/files/arm/rpcd_luci +++ b/package/emortal/autocore/files/arm/rpcd_luci @@ -218,8 +218,9 @@ local methods = { rv.dropbear = fs.access("/usr/sbin/dropbear") rv.cabundle = fs.access("/etc/ssl/certs/ca-certificates.crt") rv.relayd = fs.access("/usr/sbin/relayd") + rv.dsl = fs.access("/sbin/vdsl_cpe_control") - local wifi_features = { "eap", "11n", "11ac", "11r", "acs", "sae", "owe", "suiteb192", "wep" } + local wifi_features = { "eap", "11n", "11ac", "11r", "acs", "sae", "owe", "suiteb192", "wep", "wps" } if fs.access("/usr/sbin/hostapd") then rv.hostapd = { cli = fs.access("/usr/sbin/hostapd_cli") } @@ -441,7 +442,7 @@ local methods = { call = function(args) local util = require "luci.util" return { - result = (os.execute("(echo %s; sleep 1; echo %s) | busybox passwd %s >/dev/null 2>&1" %{ + result = (os.execute("(echo %s; sleep 1; echo %s) | /bin/busybox passwd %s >/dev/null 2>&1" %{ luci.util.shellquote(args.password), luci.util.shellquote(args.password), luci.util.shellquote(args.username) diff --git a/package/emortal/autocore/files/arm/rpcd_luci-mod-status.json b/package/emortal/autocore/files/arm/rpcd_luci-mod-status.json index 2b80adcd26..61fcc30a1c 100644 --- a/package/emortal/autocore/files/arm/rpcd_luci-mod-status.json +++ b/package/emortal/autocore/files/arm/rpcd_luci-mod-status.json @@ -104,6 +104,9 @@ "file": [ "list", "read" ], "system": [ "board", "info" ] } + }, + "write": { + "uci": [ "dhcp" ] } }, diff --git a/package/emortal/autocore/files/x86/rpcd_10_system.js b/package/emortal/autocore/files/x86/rpcd_10_system.js index d36d372b27..03b1ffe9f5 100644 --- a/package/emortal/autocore/files/x86/rpcd_10_system.js +++ b/package/emortal/autocore/files/x86/rpcd_10_system.js @@ -75,6 +75,7 @@ return baseclass.extend({ _('Hostname'), boardinfo.hostname, _('Model'), boardinfo.model + cpubench.cpubench, _('CPU Info'), cpuinfo.cpuinfo, + _('Target Platform'), (L.isObject(boardinfo.release) ? boardinfo.release.target : ''), _('Firmware Version'), (L.isObject(boardinfo.release) ? boardinfo.release.description + ' / ' : '') + (luciversion || ''), _('Kernel Version'), boardinfo.kernel, _('Local Time'), datestr, diff --git a/package/emortal/autocore/files/x86/rpcd_luci b/package/emortal/autocore/files/x86/rpcd_luci index 6a344ae69b..5d95c7b82e 100755 --- a/package/emortal/autocore/files/x86/rpcd_luci +++ b/package/emortal/autocore/files/x86/rpcd_luci @@ -218,8 +218,9 @@ local methods = { rv.dropbear = fs.access("/usr/sbin/dropbear") rv.cabundle = fs.access("/etc/ssl/certs/ca-certificates.crt") rv.relayd = fs.access("/usr/sbin/relayd") + rv.dsl = fs.access("/sbin/vdsl_cpe_control") - local wifi_features = { "eap", "11n", "11ac", "11r", "acs", "sae", "owe", "suiteb192", "wep" } + local wifi_features = { "eap", "11n", "11ac", "11r", "acs", "sae", "owe", "suiteb192", "wep", "wps" } if fs.access("/usr/sbin/hostapd") then rv.hostapd = { cli = fs.access("/usr/sbin/hostapd_cli") } @@ -441,7 +442,7 @@ local methods = { call = function(args) local util = require "luci.util" return { - result = (os.execute("(echo %s; sleep 1; echo %s) | busybox passwd %s >/dev/null 2>&1" %{ + result = (os.execute("(echo %s; sleep 1; echo %s) | /bin/busybox passwd %s >/dev/null 2>&1" %{ luci.util.shellquote(args.password), luci.util.shellquote(args.password), luci.util.shellquote(args.username) diff --git a/package/emortal/autocore/files/x86/rpcd_luci-mod-status.json b/package/emortal/autocore/files/x86/rpcd_luci-mod-status.json index 938c4513ff..0e5b81d832 100644 --- a/package/emortal/autocore/files/x86/rpcd_luci-mod-status.json +++ b/package/emortal/autocore/files/x86/rpcd_luci-mod-status.json @@ -104,6 +104,9 @@ "file": [ "list", "read" ], "system": [ "board", "info" ] } + }, + "write": { + "uci": [ "dhcp" ] } },