forked from zentralwerk/network
pkgs/ap: move uciDeleteAll outside `uci batch`
This commit is contained in:
parent
50a81b1f8d
commit
25217f0b82
|
@ -160,6 +160,9 @@ in ''
|
||||||
'') config.site.sshPubKeys}
|
'') config.site.sshPubKeys}
|
||||||
|
|
||||||
# System configuration
|
# System configuration
|
||||||
|
${uciDeleteAll "switch.@switch_vlan"}
|
||||||
|
${uciDeleteAll "wireless.@wifi"}
|
||||||
|
|
||||||
uci batch <<__UCI__
|
uci batch <<__UCI__
|
||||||
set system.@system[0].hostname=${hostName}
|
set system.@system[0].hostname=${hostName}
|
||||||
set dhcp.@dnsmasq[0].enabled=0
|
set dhcp.@dnsmasq[0].enabled=0
|
||||||
|
@ -175,8 +178,6 @@ in ''
|
||||||
|
|
||||||
# Switch config
|
# Switch config
|
||||||
${optionalString hasSwitch ''
|
${optionalString hasSwitch ''
|
||||||
${uciDeleteAll "switch.@switch_vlan"}
|
|
||||||
|
|
||||||
# Ports ${portsDoc}
|
# Ports ${portsDoc}
|
||||||
${concatMapStrings (net: ''
|
${concatMapStrings (net: ''
|
||||||
add network switch_vlan
|
add network switch_vlan
|
||||||
|
@ -226,8 +227,6 @@ in ''
|
||||||
'') (builtins.attrNames hostConfig.interfaces)
|
'') (builtins.attrNames hostConfig.interfaces)
|
||||||
}
|
}
|
||||||
|
|
||||||
${uciDeleteAll "wireless.@wifi"}
|
|
||||||
|
|
||||||
${concatStrings (imap0 (index: path:
|
${concatStrings (imap0 (index: path:
|
||||||
let
|
let
|
||||||
radioConfig = hostConfig.wifi.${path};
|
radioConfig = hostConfig.wifi.${path};
|
||||||
|
|
Loading…
Reference in New Issue