esavkin
/
it-infra
forked from M-Labs/it-infra
1
0
Fork 0
Code Pull Requests Activity

Compare commits

base: esavkin:eabd92d2e8aebcfa4220048b9f1fba36c929016b
Branches Tags
esavkin:master
esavkin:34-network-cycle-dependency-fix
esavkin:intl-upload-fix
M-Labs:master
...
compare: esavkin:b1779b57cc40ef6203d16d08979fd2a7985ff92a
Branches Tags
esavkin:34-network-cycle-dependency-fix
esavkin:intl-upload-fix
esavkin:master
M-Labs:master

2 Commits
eabd92d2e8 ... b1779b57cc

Author SHA1 Message Date
Egor Savkin b1779b57cc Break cycle dependency of tunnel netdev services on network setup 
This changes the following chain after nixos-rebuild switch with modified tunnel interfaces:
stop network-setup -> stop TUN-netdev -> stop network-addresses-TUN -> start network-addresses-TUN (fails since it depends on TUN-netdev which is off).

Chain after this change:
stop TUN-netdev -> stop network-setup -> stop network-addresses-TUN -> start TUN-netdev -> start network-addresses-TUN -> start network-setup

Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-10-30 17:23:52 +08:00
Sébastien Bourdeauducq 4f8d84e3ef nixbld: enable prioNixbld for new defenestrate 2024-10-30 14:53:56 +08:00
1 changed files with 9 additions and 1 deletions
Show Stats Expand all files Collapse all files

10
nixbld-etc-nixos/configuration.nix
View File

@ -358,6 +358,14 @@ in
}; };
}; };
# Break cycle dependency making netdev service stop when network-setup is stopped
systemd.services."${netifAlt}-netdev" = {
partOf = pkgs.lib.mkOverride 1 [ ];
};
systemd.services."${netifUSA}-netdev" = {
partOf = pkgs.lib.mkOverride 1 [ ];
};
# https://kb.isc.org/docs/dnssec-key-and-signing-policy # https://kb.isc.org/docs/dnssec-key-and-signing-policy
# chown named.named /etc/nixos/named # chown named.named /etc/nixos/named
services.bind = { services.bind = {
@ -982,7 +990,7 @@ in
expires 60d; expires 60d;
''; '';
}; };
locations."/nuc-netboot/".alias = "${import ./defenestrate}/"; locations."/nuc-netboot/".alias = "${import ./defenestrate { prioNixbld = true; } }/";
# legacy URLs, redirect to avoid breaking people's bookmarks # legacy URLs, redirect to avoid breaking people's bookmarks
locations."/gateware.html".extraConfig = '' locations."/gateware.html".extraConfig = ''