diff --git a/modules/initrd-networking.nix b/modules/initrd-networking.nix index 74e55f5..2c4d05f 100644 --- a/modules/initrd-networking.nix +++ b/modules/initrd-networking.nix @@ -33,6 +33,7 @@ in config = { # Hack so that network is considered up by boot.initrd.network and postCommands gets executed. boot.kernelParams = [ "ip=127.0.0.1:::::lo:none" ]; + boot.initrd.systemd.enable = false; boot.initrd.network = { enable = true; @@ -47,14 +48,15 @@ in authorizedKeys = config.users.users.root.openssh.authorizedKeys.keys; }; postCommands = '' - ip link set dev eth0 up + ip addr + ip link set dev enp6s0 up - ip addr add ${cfg.ipv4.address}/${cfg.ipv4.cidr} dev eth0 - ip route add ${cfg.ipv4.gateway} dev eth0 - ip route add default via ${cfg.ipv4.gateway} dev eth0 + ip addr add ${cfg.ipv4.address}/${cfg.ipv4.cidr} dev enp6s0 + ip route add ${cfg.ipv4.gateway} dev enp6s0 + ip route add default via ${cfg.ipv4.gateway} dev enp6s0 - ip -6 addr add ${cfg.ipv6.address}/${cfg.ipv6.cidr} dev eth0 - ip -6 route add default via fe80::1 dev eth0 + ip -6 addr add ${cfg.ipv6.address}/${cfg.ipv6.cidr} dev enp6s0 + ip -6 route add default via fe80::1 dev enp6s0 ''; }; diff --git a/modules/web01/gitea/actions-runner.nix b/modules/web01/gitea/actions-runner.nix index 464bbba..f28f18c 100644 --- a/modules/web01/gitea/actions-runner.nix +++ b/modules/web01/gitea/actions-runner.nix @@ -205,7 +205,7 @@ lib.mkMerge [{ settings = { container.options = "-e NIX_BUILD_SHELL=/bin/bash -e PAGER=cat -e PATH=/bin -e SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt --device /dev/kvm -v /nix:/nix -v ${storeDeps}/bin:/bin -v ${storeDeps}/etc/ssl:/etc/ssl --user nixuser --device=/dev/kvm"; # the default network that also respects our dns server settings - container.network = "podman"; + container.network = "host"; container.valid_volumes = [ "/nix" "${storeDeps}/bin"