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

Merge #100

Browse source 
100: get rid of virtual variant again r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
This commit is contained in:
bors[bot] 2023-05-07 19:45:16 +00:00 committed by GitHub
commit a2c966cac6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -14,7 +14,7 @@ Kexec is a mechanism in Linux to load a new kernel from a running Linux to
replace the current kernel. This is useful for booting the Nixos installer from replace the current kernel. This is useful for booting the Nixos installer from
existing Linux distributions, such as server provider that do not offer a NixOS existing Linux distributions, such as server provider that do not offer a NixOS
option. After running kexec, the NixOS installer exists only in memory. At the option. After running kexec, the NixOS installer exists only in memory. At the
time of writing, this requires at least 2.5GB of physical RAM (swap does not time of writing, this requires at least 1.5GB of physical RAM (swap does not
count) in the system. If not enough RAM is available, the initrd cannot be count) in the system. If not enough RAM is available, the initrd cannot be
loaded. Because the NixOS runs only in RAM, users can reformat all the system's loaded. Because the NixOS runs only in RAM, users can reformat all the system's
discs to prepare for a new NixOS installation. discs to prepare for a new NixOS installation.
@ -22,7 +22,7 @@ discs to prepare for a new NixOS installation.
It can be booted as follows by running these commands as root: It can be booted as follows by running these commands as root:
``` ```
curl -L https://github.com/nix-community/nixos-images/releases/download/nixos-unstable/nixos-kexec-installer-x86_64-linux.tar.gz | tar -xzf- -C /root curl -L https://github.com/nix-community/nixos-images/releases/download/nixos-unstable/nixos-kexec-installer-noninteractive-x86_64-linux.tar.gz | tar -xzf- -C /root
/root/kexec/run /root/kexec/run
``` ```

1
build-images.sh
View file

@ -31,7 +31,6 @@ main() {
trap 'rm -rf -- "$tmp"' EXIT trap 'rm -rf -- "$tmp"' EXIT
( (
build_kexec_installer "$tag" "$arch" "$tmp" "" build_kexec_installer "$tag" "$arch" "$tmp" ""
build_kexec_installer "$tag" "$arch" "$tmp" "-virtual-noninteractive"
build_kexec_installer "$tag" "$arch" "$tmp" "-noninteractive" build_kexec_installer "$tag" "$arch" "$tmp" "-noninteractive"
build_netboot_image "$tag" "$arch" "$tmp" build_netboot_image "$tag" "$arch" "$tmp"
) | readarray -t assets ) | readarray -t assets

10
flake.nix
View file

@ -32,20 +32,10 @@
{ system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; } { system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; }
self.nixosModules.noninteractive self.nixosModules.noninteractive
]; ];
kexec-installer-nixos-unstable-virtual-noninteractive = kexec-installer nixos-unstable [
{ system.kexec-installer.name = "nixos-kexec-installer-virtual-noninteractive"; }
self.nixosModules.noninteractive self.nixosModules.virtual
];
kexec-installer-nixos-2211-virtual-noninteractive = kexec-installer nixos-2211 [
{ system.kexec-installer.name = "nixos-kexec-installer-virtual-noninteractive"; }
self.nixosModules.noninteractive self.nixosModules.virtual
];
}); });
nixosModules = { nixosModules = {
kexec-installer = ./nix/kexec-installer/module.nix; kexec-installer = ./nix/kexec-installer/module.nix;
noninteractive = ./nix/noninteractive.nix; noninteractive = ./nix/noninteractive.nix;
virtual = ./nix/virtual.nix;
}; };
checks.x86_64-linux = let checks.x86_64-linux = let
pkgs = nixos-unstable.legacyPackages.x86_64-linux; pkgs = nixos-unstable.legacyPackages.x86_64-linux;

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

@ -21,7 +21,7 @@ in makeTest' {
(modulesPath + "/profiles/minimal.nix") (modulesPath + "/profiles/minimal.nix")
]; ];
virtualisation.memorySize = 2 * 1024 + 767; virtualisation.memorySize = 1024 + 512;
virtualisation.diskSize = 4 * 1024; virtualisation.diskSize = 4 * 1024;
virtualisation.useBootLoader = true; virtualisation.useBootLoader = true;
virtualisation.useEFIBoot = true; virtualisation.useEFIBoot = true;
@ -68,6 +68,7 @@ in makeTest' {
environment.systemPackages = [ pkgs.hello ]; environment.systemPackages = [ pkgs.hello ];
imports = [ imports = [
./module.nix ./module.nix
../noninteractive.nix
]; ];
}; };

3
nix/noninteractive.nix
View file

@ -26,4 +26,7 @@
kernelModules = [ "zfs" ]; kernelModules = [ "zfs" ];
extraModulePackages = [ config.boot.kernelPackages.zfs ]; extraModulePackages = [ config.boot.kernelPackages.zfs ];
}; };
# we can drop this after 23.05 has been released, which has this set by default
hardware.enableRedistributableFirmware = lib.mkForce false;
} }

5
nix/virtual.nix
View file

@ -1,5 +0,0 @@
# This module optimizes for deployments to virtualized hosts.
{ lib, ... }: {
hardware.enableRedistributableFirmware = lib.mkForce false;
}