From 5fc04fb34ad143e81594ef34d312db5b4bcc7cf8 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 13 Jul 2018 20:06:03 +0200
Subject: [PATCH] gluon-wan-dnsmasq: replace nixio with luaposix
---
.../luasrc/lib/gluon/wan-dnsmasq/update.lua | 21 ++++++++++---------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/package/gluon-wan-dnsmasq/luasrc/lib/gluon/wan-dnsmasq/update.lua b/package/gluon-wan-dnsmasq/luasrc/lib/gluon/wan-dnsmasq/update.lua
index d1a3d99e7..edd33f2cb 100755
--- a/package/gluon-wan-dnsmasq/luasrc/lib/gluon/wan-dnsmasq/update.lua
+++ b/package/gluon-wan-dnsmasq/luasrc/lib/gluon/wan-dnsmasq/update.lua
@@ -1,12 +1,12 @@
#!/usr/bin/lua
-local RESOLV_CONF_DIR = '/var/gluon/wan-dnsmasq'
-local RESOLV_CONF = RESOLV_CONF_DIR .. '/resolv.conf'
+local RESOLV_CONF = '/var/gluon/wan-dnsmasq/resolv.conf'
+local stat = require 'posix.sys.stat'
local ubus = require('ubus').connect()
local uci = require('simple-uci').cursor()
-local fs = require 'nixio.fs'
+local util = require 'gluon.util'
local new_servers = ''
@@ -46,14 +46,15 @@ else
end
-fs.mkdirr(RESOLV_CONF_DIR)
-
-local old_servers = fs.readfile(RESOLV_CONF)
+local old_servers = util.readfile(RESOLV_CONF)
if new_servers ~= old_servers then
- local f = io.open(RESOLV_CONF .. '.tmp', 'w')
- f:write(new_servers)
- f:close()
+ stat.mkdir('/var/gluon')
+ stat.mkdir('/var/gluon/wan-dnsmasq')
+
+ local f = io.open(RESOLV_CONF .. '.tmp', 'w')
+ f:write(new_servers)
+ f:close()
- fs.rename(RESOLV_CONF .. '.tmp', RESOLV_CONF)
+ os.rename(RESOLV_CONF .. '.tmp', RESOLV_CONF)
end
--
GitLab