diff options
| -rw-r--r-- | lbu-model.lua | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lbu-model.lua b/lbu-model.lua index 0ff1b96..bda4b8c 100644 --- a/lbu-model.lua +++ b/lbu-model.lua @@ -4,7 +4,6 @@ module (..., package.seeall) require("modelfunctions") require("fs") require("format") -require("getopts") require("validator") -- Set variables @@ -172,7 +171,7 @@ end local was_mounted local mnt local function mount() - local configopts = getopts.getoptsfromfile(configfile, "") or {} + local configopts = format.parse_configfile2(fs.read_file(configfile), "") or {} mnt = "/media/"..configopts.LBU_MEDIA local f = io.popen("grep "..mnt.." /proc/mounts") local cmdresult = f:read("*a") @@ -233,9 +232,9 @@ function getconfig (configcontents) local config = {} local configopts = {} if configcontents then - configopts = getopts.getoptsfromfile(configcontents, "") or {} + configopts = format.parse_configfile2(configcontents, "") or {} elseif (fs.is_file(configfile)) then - configopts = getopts.getoptsfromfile(configfile, "") or {} + configopts = format.parse_configfile2(fs.read_file(configfile), "") or {} end config["LBU_MEDIA"] = cfe({ value=configopts.LBU_MEDIA or "", |