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

no longer depend on dhcpcd for dhcp networking

Browse source
This commit is contained in:
Jörg Thalheim 2023-11-02 10:43:08 +01:00
parent 8f0b2d8f63
commit 8239d6079a
3 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nix/installer.nix
View file

@ -38,6 +38,7 @@
"${pkgs.iproute2}/bin/ip -c addr" "${pkgs.iproute2}/bin/ip -c addr"
"${pkgs.iproute2}/bin/ip -c -6 route" "${pkgs.iproute2}/bin/ip -c -6 route"
"${pkgs.iproute2}/bin/ip -c -4 route" "${pkgs.iproute2}/bin/ip -c -4 route"
"${pkgs.systemd}/bin/networkctl status"
]; ];
}; };
}; };

11
nix/kexec-installer/restore_routes.py
View file

@ -47,7 +47,7 @@ def generate_networkd_units(
) -> None: ) -> None:
directory.mkdir(exist_ok=True) directory.mkdir(exist_ok=True)
for interface in interfaces: for interface in interfaces:
name = f"{interface['ifname']}.network" name = f"00-{interface['ifname']}.network"
addresses = [ addresses = [
f"Address = {addr['local']}/{addr['prefixlen']}" f"Address = {addr['local']}/{addr['prefixlen']}"
for addr in interface.get("addr_info", []) for addr in interface.get("addr_info", [])
@ -76,8 +76,17 @@ def generate_networkd_units(
MACAddress = {interface["address"]} MACAddress = {interface["address"]}
[Network] [Network]
# both ipv4 and ipv6
DHCP = yes DHCP = yes
# link-local multicast name resolution
LLMNR = yes
# lets us discover the switch port we're connected to
LLDP = yes
# ipv6 router advertisements
IPv6AcceptRA = yes IPv6AcceptRA = yes
# allows us to ping "nixos.local"
MulticastDNS = yes
""" """
unit += "\n".join(addresses) unit += "\n".join(addresses)
unit += "\n" + "\n".join(route_sections) unit += "\n" + "\n".join(route_sections)

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

@ -33,10 +33,8 @@ makeTest' {
services.openssh.enable = true; services.openssh.enable = true;
networking = { networking.useNetworkd = true;
useNetworkd = true; networking.useDHCP = false;
useDHCP = false;
};
users.users.root.openssh.authorizedKeys.keyFiles = [ ./ssh-keys/id_ed25519.pub ]; users.users.root.openssh.authorizedKeys.keyFiles = [ ./ssh-keys/id_ed25519.pub ];
@ -104,17 +102,17 @@ makeTest' {
def ssh(cmd: list[str], check: bool = True, stdout: Optional[int] = None) -> subprocess.CompletedProcess: def ssh(cmd: list[str], check: bool = True, stdout: Optional[int] = None) -> subprocess.CompletedProcess:
ssh_cmd = [ ssh_cmd = [
"${pkgs.openssh}/bin/ssh", "${pkgs.openssh}/bin/ssh",
"-o", "StrictHostKeyChecking=no", "-o", "StrictHostKeyChecking=no",
"-o", "ConnectTimeout=1", "-o", "ConnectTimeout=1",
"-i", "${./ssh-keys/id_ed25519}", "-i", "${./ssh-keys/id_ed25519}",
"-p", "2222", "-p", "2222",
"root@127.0.0.1", "root@127.0.0.1",
"--" "--"
] + cmd ] + cmd
print(" ".join(ssh_cmd)) print(" ".join(ssh_cmd))
return subprocess.run(ssh_cmd, return subprocess.run(ssh_cmd,
text=True, text=True,
check=check, check=check,
stdout=stdout) stdout=stdout)
@ -136,14 +134,19 @@ makeTest' {
node1.succeed('/root/kexec/run >&2') node1.succeed('/root/kexec/run >&2')
# wait for kexec to finish # wait for kexec to finish
while ssh(["true"], check=False).returncode == 0: while ssh(["true"], check=False).returncode == 0:
print("Waiting for kexec to finish...") print("Waiting for kexec to finish...")
time.sleep(1) time.sleep(1)
while ssh(["true"], check=False).returncode != 0: while ssh(["true"], check=False).returncode != 0:
print("Waiting for node2 to come up...") print("Waiting for node2 to come up...")
time.sleep(1) time.sleep(1)
while ssh(["systemctl is-active restore-network"], check=False).returncode != 0:
print("Waiting for network to be restored...")
time.sleep(1)
ssh(["systemctl", "status", "restore-network"])
print(ssh(["ip", "addr"])) print(ssh(["ip", "addr"]))
print(ssh(["ip", "route"])) print(ssh(["ip", "route"]))
print(ssh(["ip", "-6", "route"])) print(ssh(["ip", "-6", "route"]))
@ -160,7 +163,7 @@ makeTest' {
root_ed25519_after = ssh(["cat", "/root/.ssh/authorized_keys"], stdout=subprocess.PIPE).stdout.strip() root_ed25519_after = ssh(["cat", "/root/.ssh/authorized_keys"], stdout=subprocess.PIPE).stdout.strip()
assert root_ed25519_before in root_ed25519_after, f"'{root_ed25519_before}' not included in '{root_ed25519_after}'" assert root_ed25519_before in root_ed25519_after, f"'{root_ed25519_before}' not included in '{root_ed25519_after}'"
print(ssh(["cat", "/etc/systemd/network/eth0.network"])) print(ssh(["cat", "/etc/systemd/network/00-eth0.network"]))
ssh(["curl", "-v", "-I", f"http://10.0.2.2:{port}"]) ssh(["curl", "-v", "-I", f"http://10.0.2.2:{port}"])
ssh(["curl", "-v", "-I", f"http://[fec0::2]:{port}"]) ssh(["curl", "-v", "-I", f"http://[fec0::2]:{port}"])