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

move kexec installer to subdirectory

Browse source
This commit is contained in:
Jörg Thalheim 2022-11-27 17:13:33 +01:00
parent 98638b3f38
commit c0fb626fd2
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build-images.sh
View file

@ -29,8 +29,8 @@ build_kexec_bundle() {
build_kexec_installer() { build_kexec_installer() {
declare -r tag=$1 arch=$2 tmp=$3 declare -r tag=$1 arch=$2 tmp=$3
# run the test once we have kvm support in github actions # 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") # 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) 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" echo "$out/nixos-kexec-installer-$arch.tar.gz"
} }

0
nix/kexec-installer.nix → nix/kexec-installer/module.nix
View file

2
nix/restore_routes.py → nix/kexec-installer/restore_routes.py
View file

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

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

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