diff options
Diffstat (limited to 'aconf/modules')
| -rw-r--r-- | aconf/modules/dnsmasq.lua | 4 | ||||
| -rw-r--r-- | aconf/modules/network.lua | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/aconf/modules/dnsmasq.lua b/aconf/modules/dnsmasq.lua index 770a1d1..413a270 100644 --- a/aconf/modules/dnsmasq.lua +++ b/aconf/modules/dnsmasq.lua @@ -34,7 +34,7 @@ Filter.redirect_address = M.net.IPAddress{ Filter.address = M.Model{model=Address, visible=false} Filter.whitelist = M.Set{ type=M.net.DomainName, - addr='server/\\#/domain', + addr='server/#/domain', ui_name='Domain whitelist', widget='inline' } @@ -43,7 +43,7 @@ local Dnsmasq = M.new() Dnsmasq.filter = M.Model{ model=Filter, addr='/augeas'..filter_conf, - be_mode={server='value', ['server/\\#/domain']='enumerate'} + be_mode={server='value', ['server/#/domain']='enumerate'} } Dnsmasq.conf_file = M.Set{ type=M.String, diff --git a/aconf/modules/network.lua b/aconf/modules/network.lua index 51d7589..e29f0b4 100644 --- a/aconf/modules/network.lua +++ b/aconf/modules/network.lua @@ -121,7 +121,7 @@ Interface.class = M.String{ local name = M.node.name(iface) if name == 'lo' then return 'loopback' end - local saddr = M.addr.rawjoin('/files', iface_sys_dir, name, '.') + local saddr = M.path.rawjoin('/files', iface_sys_dir, name, '.') if not txn:get(saddr) then return 'logical' end for _, addr in ipairs{ @@ -129,7 +129,7 @@ Interface.class = M.String{ {saddr, 'bridge'}, {'/files/proc/net/vlan', name} } do - if txn:get(M.addr.join(table.unpack(addr))) then + if txn:get(M.path.join(table.unpack(addr))) then return 'logical' end end @@ -235,7 +235,7 @@ Interface.stats = M.Collection{ type=M.Number{editable=false}, editable=false, addr=function(path) - return M.addr.join( + return M.path.join( '/files/sys/class/net', M.path.name(path), 'statistics' ) end, |