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

get rid of virtual variant again

Browse source 
In unstable this has now the same size as the noninteractive one.
This commit is contained in:
Jörg Thalheim 2023-05-07 21:32:47 +02:00
parent d5f7390287
commit e855c9b4b9
5 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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 = 2048;
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;
}