diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-10-31 16:25:49 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-11-01 12:03:33 +0100 |
| commit | 5ce16764ad3212367547555dbbfe9c5f4f221118 (patch) | |
| tree | 3218177ddadb8f823a12a2fbd60d392ff48346d7 /modules/luci-base/root/usr | |
| parent | c67d2ddc2ce34bb2d985b3864706d2cf49e65b6c (diff) | |
luci-base, luci-mod-system: replace luci/setUmount with fs.exec calls
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-base/root/usr')
| -rwxr-xr-x | modules/luci-base/root/usr/libexec/rpcd/luci | 8 | ||||
| -rw-r--r-- | modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/modules/luci-base/root/usr/libexec/rpcd/luci b/modules/luci-base/root/usr/libexec/rpcd/luci index f200ee5f4f..2601512da6 100755 --- a/modules/luci-base/root/usr/libexec/rpcd/luci +++ b/modules/luci-base/root/usr/libexec/rpcd/luci @@ -516,14 +516,6 @@ local methods = { return { error = err } end end - }, - - setUmount = { - args = { path = "/mnt" }, - call = function(args) - local util = require "luci.util" - return { result = (os.execute(string.format("/bin/umount %s", util.shellquote(args.path))) == 0) } - end } } diff --git a/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json b/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json index 51a7860dea..e757beab6c 100644 --- a/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json +++ b/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json @@ -63,13 +63,14 @@ "/sbin/reboot": [ "exec" ], "/sbin/sysupgrade": [ "exec" ], "/bin/tar": [ "exec" ], + "/bin/umount": [ "exec" ], "/tmp/backup.tar.gz": [ "write" ], "/tmp/firmware.bin": [ "write" ] }, "ubus": { "file": [ "write", "remove", "exec" ], "iwinfo": [ "scan" ], - "luci": [ "setInitAction", "setLocaltime", "setPassword", "setBlockDetect", "setUmount" ], + "luci": [ "setInitAction", "setLocaltime", "setPassword", "setBlockDetect" ], "uci": [ "add", "apply", "confirm", "delete", "order", "set", "rename" ] }, "uci": [ "*" ] |