emily/nixos-images
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kexec-installer: use camel case for service names

Browse source
This commit is contained in:
Jörg Thalheim 2023-01-05 11:03:55 +01:00
parent 209b1d9ee6
commit 1fde0cda9e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nix/kexec-installer/module.nix
View file

@ -1,6 +1,6 @@
{ config, lib, modulesPath, pkgs, ... }: { config, lib, modulesPath, pkgs, ... }:
let let
restoreNetwork = pkgs.writers.writePython3 "restore-network" { restore-network = pkgs.writers.writePython3 "restore-network" {
flakeIgnore = ["E501"]; flakeIgnore = ["E501"];
} ./restore_routes.py; } ./restore_routes.py;
@ -106,7 +106,7 @@ in {
pkgs.jq pkgs.jq
]; ];
systemd.services.restoreNetwork = { systemd.services.restore-network = {
before = [ "network-pre.target" ]; before = [ "network-pre.target" ];
wants = [ "network-pre.target" ]; wants = [ "network-pre.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@ -115,7 +115,7 @@ in {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
ExecStart = [ ExecStart = [
"${restoreNetwork} /root/network/addrs.json /root/network/routes-v4.json /root/network/routes-v6.json /etc/systemd/network" "${restore-network} /root/network/addrs.json /root/network/routes-v4.json /root/network/routes-v6.json /etc/systemd/network"
]; ];
}; };

2
nix/kexec-installer/test.nix
View file

@ -156,7 +156,7 @@ in makeTest' {
assert root_ed25519_before == root_ed25519_after, f"{root_ed25519_before} != {root_ed25519_after}" assert root_ed25519_before == root_ed25519_after, f"{root_ed25519_before} != {root_ed25519_after}"
# See if we can reach the router after kexec # See if we can reach the router after kexec
node1.wait_for_unit("restoreNetwork.service") node1.wait_for_unit("restore-network.service")
node1.wait_until_succeeds("cat /etc/systemd/network/eth1.network >&2") node1.wait_until_succeeds("cat /etc/systemd/network/eth1.network >&2")
node1.wait_until_succeeds("ping -c1 10.0.0.1") node1.wait_until_succeeds("ping -c1 10.0.0.1")
node1.wait_until_succeeds("ping -c1 2001:db8::1") node1.wait_until_succeeds("ping -c1 2001:db8::1")