diff --git a/nix/pkgs/ap.nix b/nix/pkgs/ap.nix index f13bfe5..14b37ce 100644 --- a/nix/pkgs/ap.nix +++ b/nix/pkgs/ap.nix @@ -202,15 +202,15 @@ in '' uci set network.mgmt.gateway=${config.site.net.mgmt.hosts4.mgmt-gw} uci set network.mgmt.ip6addr=${config.site.net.mgmt.hosts6.dn42.${hostName}}/64 uci set network.mgmt.ip6gw=${config.site.net.mgmt.hosts6.dn42.mgmt-gw} - uci delete network.mgmt.dns + uci -q delete network.mgmt.dns || true uci add_list network.mgmt.dns=${config.site.net.serv.hosts4.dnscache} uci add_list network.mgmt.dns=${config.site.net.serv.hosts6.dn42.dnscache} - uci delete network.globals.ula_prefix + uci -q delete network.globals.ula_prefix || true # delete unused networks ${concatMapStrings (net: lib.optionalString (! hostConfig.interfaces ? ${net}) '' - uci delete network.${net} + uci -q delete network.${net} || true '' ) ([ "lan" "wan" "wan6" ] ++ builtins.attrNames config.site.net)} @@ -227,8 +227,8 @@ in '' '') (builtins.attrNames hostConfig.interfaces) } - uci delete wireless.default_radio0 - uci delete wireless.default_radio1 + uci -q delete wireless.default_radio0 || true + uci -q delete wireless.default_radio1 || true ${concatStrings (imap0 (index: path: let radioConfig = hostConfig.wifi.${path}; @@ -243,7 +243,7 @@ in '' uci set wireless.radio${toString index}.path=${path} uci set wireless.radio${toString index}.htmode=${radioConfig.htmode} uci set wireless.radio${toString index}.noscan=1 - uci delete wireless.radio${toString index}.disabled + uci -q delete wireless.radio${toString index}.disabled || true ${concatMapStrings (ssid: let @@ -263,7 +263,7 @@ in '' '' else '' uci set wireless.@wifi-iface[-1].encryption=none - uci delete wireless.@wifi-iface[-1].key + uci -q delete wireless.@wifi-iface[-1].key || true ''} '' @@ -307,7 +307,7 @@ in '' /etc/init.d/cron restart for svc in dnsmasq uhttpd ; do - rm /etc/rc.d/*\$svc + rm -f /etc/rc.d/*\$svc /etc/init.d/\$svc stop done