move kexec installer to subdirectory

build-images.sh

@@ -29,8 +29,8 @@ build_kexec_bundle() {
 build_kexec_installer() {
   declare -r tag=$1 arch=$2 tmp=$3
   # run the test once we have kvm support in github actions
-  # ignore=$(nix-build ./nix/kexec-installer-test.nix -I "nixpkgs=https://github.com/NixOS/nixpkgs/archive/${tag}.tar.gz" --argstr system "$arch")
-  out=$(nix-build '<nixpkgs/nixos>' -o "$tmp/kexec-installer-$arch" -I nixos-config=./nix/kexec-installer.nix -I "nixpkgs=https://github.com/NixOS/nixpkgs/archive/${tag}.tar.gz" --argstr system "$arch" -A config.system.build.kexecTarball)
+  # ignore=$(nix-build ./nix/kexec-installer/test.nix -I "nixpkgs=https://github.com/NixOS/nixpkgs/archive/${tag}.tar.gz" --argstr system "$arch")
+  out=$(nix-build '<nixpkgs/nixos>' -o "$tmp/kexec-installer-$arch" -I nixos-config=./nix/kexec-installer/module.nix -I "nixpkgs=https://github.com/NixOS/nixpkgs/archive/${tag}.tar.gz" --argstr system "$arch" -A config.system.build.kexecTarball)
   echo "$out/nixos-kexec-installer-$arch.tar.gz"
 }
 

nix/kexec-installer/restore_routes.py

@@ -58,7 +58,7 @@ def generate_networkd_units(
             if route["dev"] != interface["ifname"]:
                 continue
 
-            route_section = f"[Route]"
+            route_section = "[Route]"
             if route["dst"] != "default":
                 # can be skipped for default routes
                 route_section += f"Destination = {route['dst']}\n"

nix/kexec-installer/test.nix

@@ -29,7 +29,7 @@ in makeTest' {
       virtualisation.vlans = [ ];
       environment.systemPackages = [ pkgs.hello ];
       imports = [
-        ./kexec-installer.nix
+        ./module.nix
       ];
     };
   };