nixos/virtualisation: format image-related files

This commit is contained in:
phaer 2024-10-17 18:27:37 +02:00
parent 1d7922b778
commit 88b285c01d
12 changed files with 1461 additions and 1179 deletions

View File

@ -1,12 +1,23 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
inherit (lib) mkOption optionalString types versionAtLeast; inherit (lib)
mkOption
optionalString
types
versionAtLeast
;
inherit (lib.options) literalExpression; inherit (lib.options) literalExpression;
cfg = config.amazonImage; cfg = config.amazonImage;
amiBootMode = if config.ec2.efi then "uefi" else "legacy-bios"; amiBootMode = if config.ec2.efi then "uefi" else "legacy-bios";
in { in
{
imports = [ ../../../modules/virtualisation/amazon-image.nix ]; imports = [ ../../../modules/virtualisation/amazon-image.nix ];
@ -14,11 +25,11 @@ in {
# experience, which prior to 4.15 was 255. # experience, which prior to 4.15 was 255.
# https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes
config.boot.kernelParams = config.boot.kernelParams =
let timeout = let
if versionAtLeast config.boot.kernelPackages.kernel.version "4.15" timeout =
then "4294967295" if versionAtLeast config.boot.kernelPackages.kernel.version "4.15" then "4294967295" else "255";
else "255"; in
in [ "nvme_core.io_timeout=${timeout}" ]; [ "nvme_core.io_timeout=${timeout}" ];
options.amazonImage = { options.amazonImage = {
name = mkOption { name = mkOption {
@ -34,7 +45,7 @@ in {
} }
] ]
''; '';
default = []; default = [ ];
description = '' description = ''
This option lists files to be copied to fixed locations in the This option lists files to be copied to fixed locations in the
generated image. Glob patterns work. generated image. Glob patterns work.
@ -49,15 +60,19 @@ in {
}; };
format = mkOption { format = mkOption {
type = types.enum [ "raw" "qcow2" "vpc" ]; type = types.enum [
"raw"
"qcow2"
"vpc"
];
default = "vpc"; default = "vpc";
description = "The image format to output"; description = "The image format to output";
}; };
}; };
config.system.build.amazonImage = let config.system.build.amazonImage =
configFile = pkgs.writeText "configuration.nix" let
'' configFile = pkgs.writeText "configuration.nix" ''
{ modulesPath, ... }: { { modulesPath, ... }: {
imports = [ "''${modulesPath}/virtualisation/amazon-image.nix" ]; imports = [ "''${modulesPath}/virtualisation/amazon-image.nix" ];
${optionalString config.ec2.efi '' ${optionalString config.ec2.efi ''
@ -71,7 +86,12 @@ in {
''; '';
zfsBuilder = import ../../../lib/make-multi-disk-zfs-image.nix { zfsBuilder = import ../../../lib/make-multi-disk-zfs-image.nix {
inherit lib config configFile pkgs; inherit
lib
config
configFile
pkgs
;
inherit (cfg) contents format name; inherit (cfg) contents format name;
includeChannel = true; includeChannel = true;
@ -119,7 +139,12 @@ in {
}; };
extBuilder = import ../../../lib/make-disk-image.nix { extBuilder = import ../../../lib/make-disk-image.nix {
inherit lib config configFile pkgs; inherit
lib
config
configFile
pkgs
;
inherit (cfg) contents format name; inherit (cfg) contents format name;
@ -154,7 +179,8 @@ in {
' > $out/nix-support/image-info.json ' > $out/nix-support/image-info.json
''; '';
}; };
in if config.ec2.zfs.enable then zfsBuilder else extBuilder; in
if config.ec2.zfs.enable then zfsBuilder else extBuilder;
meta.maintainers = with lib.maintainers; [ arianvp ]; meta.maintainers = with lib.maintainers; [ arianvp ];
} }

View File

@ -1,6 +1,11 @@
# nix-build '<nixpkgs/nixos>' -A config.system.build.openstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/openstack-image.nix ]; }" # nix-build '<nixpkgs/nixos>' -A config.system.build.openstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/openstack-image.nix ]; }"
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
copyChannel = true; copyChannel = true;
@ -12,7 +17,6 @@ in
../../../modules/virtualisation/openstack-config.nix ../../../modules/virtualisation/openstack-config.nix
] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix); ] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix);
options.openstackImage = { options.openstackImage = {
name = mkOption { name = mkOption {
type = types.str; type = types.str;
@ -33,7 +37,10 @@ in
}; };
format = mkOption { format = mkOption {
type = types.enum [ "raw" "qcow2" ]; type = types.enum [
"raw"
"qcow2"
];
default = "qcow2"; default = "qcow2";
description = "The image format to output"; description = "The image format to output";
}; };
@ -59,8 +66,7 @@ in
inherit (cfg) contents format name; inherit (cfg) contents format name;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
configFile = pkgs.writeText "configuration.nix" configFile = pkgs.writeText "configuration.nix" ''
''
{ modulesPath, ... }: { { modulesPath, ... }: {
imports = [ "''${modulesPath}/virtualisation/openstack-config.nix" ]; imports = [ "''${modulesPath}/virtualisation/openstack-config.nix" ];
openstack.zfs.enable = true; openstack.zfs.enable = true;

View File

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with lib; with lib;
let let
@ -35,7 +40,12 @@ in
}; };
vmGeneration = mkOption { vmGeneration = mkOption {
type = with types; enum [ "v1" "v2" ]; type =
with types;
enum [
"v1"
"v2"
];
default = "v1"; default = "v1";
description = '' description = ''
VM Generation to use. VM Generation to use.

View File

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with lib; with lib;
let let
@ -31,7 +36,10 @@ in
}; };
virtualisation.digitalOceanImage.compressionMethod = mkOption { virtualisation.digitalOceanImage.compressionMethod = mkOption {
type = types.enum [ "gzip" "bzip2" ]; type = types.enum [
"gzip"
"bzip2"
];
default = "gzip"; default = "gzip";
example = "bzip2"; example = "bzip2";
description = '' description = ''
@ -48,23 +56,32 @@ in
system.build.digitalOceanImage = import ../../lib/make-disk-image.nix { system.build.digitalOceanImage = import ../../lib/make-disk-image.nix {
name = "digital-ocean-image"; name = "digital-ocean-image";
format = "qcow2"; format = "qcow2";
postVM = let postVM =
compress = { let
compress =
{
"gzip" = "${pkgs.gzip}/bin/gzip"; "gzip" = "${pkgs.gzip}/bin/gzip";
"bzip2" = "${pkgs.bzip2}/bin/bzip2"; "bzip2" = "${pkgs.bzip2}/bin/bzip2";
}.${cfg.compressionMethod}; }
in '' .${cfg.compressionMethod};
in
''
${compress} $diskImage ${compress} $diskImage
''; '';
configFile = if cfg.configFile == null configFile =
then config.virtualisation.digitalOcean.defaultConfigFile if cfg.configFile == null then
else cfg.configFile; config.virtualisation.digitalOcean.defaultConfigFile
else
cfg.configFile;
inherit (cfg) diskSize; inherit (cfg) diskSize;
inherit config lib pkgs; inherit config lib pkgs;
}; };
}; };
meta.maintainers = with maintainers; [ arianvp eamsden ]; meta.maintainers = with maintainers; [
arianvp
eamsden
];
} }

View File

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with lib; with lib;
let let
@ -64,7 +69,13 @@ in
system.build.googleComputeImage = import ../../lib/make-disk-image.nix { system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
name = "google-compute-image"; name = "google-compute-image";
postVM = '' postVM = ''
PATH=$PATH:${with pkgs; lib.makeBinPath [ gnutar gzip ]} PATH=$PATH:${
with pkgs;
lib.makeBinPath [
gnutar
gzip
]
}
pushd $out pushd $out
mv $diskImage disk.raw mv $diskImage disk.raw
tar -Sc disk.raw | gzip -${toString cfg.compressionLevel} > \ tar -Sc disk.raw | gzip -${toString cfg.compressionLevel} > \

View File

@ -1,11 +1,17 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
with lib; with lib;
let let
cfg = config.hyperv; cfg = config.hyperv;
in { in
{
options = { options = {
hyperv = { hyperv = {
baseImageSize = mkOption { baseImageSize = mkOption {

View File

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with lib; with lib;
let let

View File

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.oci; cfg = config.oci;
@ -25,7 +30,10 @@ in
after = [ "network-online.target" ]; after = [ "network-online.target" ];
wants = [ "network-online.target" ]; wants = [ "network-online.target" ];
path = [ pkgs.coreutils pkgs.curl ]; path = [
pkgs.coreutils
pkgs.curl
];
script = '' script = ''
mkdir -m 0700 -p /root/.ssh mkdir -m 0700 -p /root/.ssh
if [ -f /root/.ssh/authorized_keys ]; then if [ -f /root/.ssh/authorized_keys ]; then

View File

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
options = { options = {
oci = { oci = {

View File

@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
with lib; with lib;
@ -54,7 +59,10 @@ with lib;
''; '';
}; };
bios = mkOption { bios = mkOption {
type = types.enum [ "seabios" "ovmf" ]; type = types.enum [
"seabios"
"ovmf"
];
default = "seabios"; default = "seabios";
description = '' description = ''
Select BIOS implementation (seabios = Legacy BIOS, ovmf = UEFI). Select BIOS implementation (seabios = Legacy BIOS, ovmf = UEFI).
@ -124,8 +132,13 @@ with lib;
}; };
}; };
qemuExtraConf = mkOption { qemuExtraConf = mkOption {
type = with types; attrsOf (oneOf [ str int ]); type =
default = {}; with types;
attrsOf (oneOf [
str
int
]);
default = { };
example = literalExpression '' example = literalExpression ''
{ {
cpu = "host"; cpu = "host";
@ -137,7 +150,12 @@ with lib;
''; '';
}; };
partitionTableType = mkOption { partitionTableType = mkOption {
type = types.enum [ "efi" "hybrid" "legacy" "legacy+gpt" ]; type = types.enum [
"efi"
"hybrid"
"legacy"
"legacy+gpt"
];
description = '' description = ''
Partition table type to use. See make-disk-image.nix partitionTableType for details. Partition table type to use. See make-disk-image.nix partitionTableType for details.
Defaults to 'legacy' for 'proxmox.qemuConf.bios="seabios"' (default), other bios values defaults to 'efi'. Defaults to 'legacy' for 'proxmox.qemuConf.bios="seabios"' (default), other bios values defaults to 'efi'.
@ -185,23 +203,30 @@ with lib;
}; };
}; };
config = let config =
let
cfg = config.proxmox; cfg = config.proxmox;
cfgLine = name: value: '' cfgLine = name: value: ''
${name}: ${builtins.toString value} ${name}: ${builtins.toString value}
''; '';
virtio0Storage = builtins.head (builtins.split ":" cfg.qemuConf.virtio0); virtio0Storage = builtins.head (builtins.split ":" cfg.qemuConf.virtio0);
cfgFile = fileName: properties: pkgs.writeTextDir fileName '' cfgFile =
fileName: properties:
pkgs.writeTextDir fileName ''
# generated by NixOS # generated by NixOS
${lib.concatStrings (lib.mapAttrsToList cfgLine properties)} ${lib.concatStrings (lib.mapAttrsToList cfgLine properties)}
#qmdump#map:virtio0:drive-virtio0:${virtio0Storage}:raw: #qmdump#map:virtio0:drive-virtio0:${virtio0Storage}:raw:
''; '';
inherit (cfg) partitionTableType; inherit (cfg) partitionTableType;
supportEfi = partitionTableType == "efi" || partitionTableType == "hybrid"; supportEfi = partitionTableType == "efi" || partitionTableType == "hybrid";
supportBios = partitionTableType == "legacy" || partitionTableType == "hybrid" || partitionTableType == "legacy+gpt"; supportBios =
partitionTableType == "legacy"
|| partitionTableType == "hybrid"
|| partitionTableType == "legacy+gpt";
hasBootPartition = partitionTableType == "efi" || partitionTableType == "hybrid"; hasBootPartition = partitionTableType == "efi" || partitionTableType == "hybrid";
hasNoFsPartition = partitionTableType == "hybrid" || partitionTableType == "legacy+gpt"; hasNoFsPartition = partitionTableType == "hybrid" || partitionTableType == "legacy+gpt";
in { in
{
assertions = [ assertions = [
{ {
assertion = config.boot.loader.systemd-boot.enable -> config.proxmox.qemuConf.bios == "ovmf"; assertion = config.boot.loader.systemd-boot.enable -> config.proxmox.qemuConf.bios == "ovmf";
@ -223,9 +248,11 @@ with lib;
system.build.VMA = import ../../lib/make-disk-image.nix { system.build.VMA = import ../../lib/make-disk-image.nix {
name = "proxmox-${cfg.filenameSuffix}"; name = "proxmox-${cfg.filenameSuffix}";
inherit (cfg) partitionTableType; inherit (cfg) partitionTableType;
postVM = let postVM =
let
# Build qemu with PVE's patch that adds support for the VMA format # Build qemu with PVE's patch that adds support for the VMA format
vma = (pkgs.qemu_kvm.override { vma =
(pkgs.qemu_kvm.override {
alsaSupport = false; alsaSupport = false;
pulseSupport = false; pulseSupport = false;
sdlSupport = false; sdlSupport = false;
@ -240,7 +267,8 @@ with lib;
numaSupport = false; numaSupport = false;
seccompSupport = false; seccompSupport = false;
guestAgentSupport = false; guestAgentSupport = false;
}).overrideAttrs ( super: rec { }).overrideAttrs
(super: rec {
# Check https://github.com/proxmox/pve-qemu/tree/master for the version # Check https://github.com/proxmox/pve-qemu/tree/master for the version
# of qemu and patch to use # of qemu and patch to use
version = "9.0.0"; version = "9.0.0";
@ -250,12 +278,14 @@ with lib;
}; };
patches = [ patches = [
# Proxmox' VMA tool is published as a particular patch upon QEMU # Proxmox' VMA tool is published as a particular patch upon QEMU
"${pkgs.fetchFromGitHub { "${
pkgs.fetchFromGitHub {
owner = "proxmox"; owner = "proxmox";
repo = "pve-qemu"; repo = "pve-qemu";
rev = "14afbdd55f04d250bd679ca1ad55d3f47cd9d4c8"; rev = "14afbdd55f04d250bd679ca1ad55d3f47cd9d4c8";
hash = "sha256-lSJQA5SHIHfxJvMLIID2drv2H43crTPMNIlIT37w9Nc="; hash = "sha256-lSJQA5SHIHfxJvMLIID2drv2H43crTPMNIlIT37w9Nc=";
}}/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch" }
}/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch"
]; ];
buildInputs = super.buildInputs ++ [ pkgs.libuuid ]; buildInputs = super.buildInputs ++ [ pkgs.libuuid ];
@ -265,7 +295,9 @@ with lib;
in in
'' ''
${vma}/bin/vma create "vzdump-qemu-${cfg.filenameSuffix}.vma" \ ${vma}/bin/vma create "vzdump-qemu-${cfg.filenameSuffix}.vma" \
-c ${cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)}/qemu-server.conf drive-virtio0=$diskImage -c ${
cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)
}/qemu-server.conf drive-virtio0=$diskImage
rm $diskImage rm $diskImage
${pkgs.zstd}/bin/zstd "vzdump-qemu-${cfg.filenameSuffix}.vma" ${pkgs.zstd}/bin/zstd "vzdump-qemu-${cfg.filenameSuffix}.vma"
mv "vzdump-qemu-${cfg.filenameSuffix}.vma.zst" $out/ mv "vzdump-qemu-${cfg.filenameSuffix}.vma.zst" $out/
@ -282,19 +314,25 @@ with lib;
growPartition = true; growPartition = true;
kernelParams = [ "console=ttyS0" ]; kernelParams = [ "console=ttyS0" ];
loader.grub = { loader.grub = {
device = lib.mkDefault (if (hasNoFsPartition || supportBios) then device = lib.mkDefault (
if (hasNoFsPartition || supportBios) then
# Even if there is a separate no-fs partition ("/dev/disk/by-partlabel/no-fs" i.e. "/dev/vda2"), # Even if there is a separate no-fs partition ("/dev/disk/by-partlabel/no-fs" i.e. "/dev/vda2"),
# which will be used the bootloader, do not set it as loader.grub.device. # which will be used the bootloader, do not set it as loader.grub.device.
# GRUB installation fails, unless the whole disk is selected. # GRUB installation fails, unless the whole disk is selected.
"/dev/vda" "/dev/vda"
else else
"nodev"); "nodev"
);
efiSupport = lib.mkDefault supportEfi; efiSupport = lib.mkDefault supportEfi;
efiInstallAsRemovable = lib.mkDefault supportEfi; efiInstallAsRemovable = lib.mkDefault supportEfi;
}; };
loader.timeout = 0; loader.timeout = 0;
initrd.availableKernelModules = [ "uas" "virtio_blk" "virtio_pci" ]; initrd.availableKernelModules = [
"uas"
"virtio_blk"
"virtio_pci"
];
}; };
fileSystems."/" = { fileSystems."/" = {

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,15 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.virtualbox; cfg = config.virtualbox;
in { in
{
options = { options = {
virtualbox = { virtualbox = {
@ -51,7 +57,14 @@ in {
''; '';
}; };
params = lib.mkOption { params = lib.mkOption {
type = with lib.types; attrsOf (oneOf [ str int bool (listOf str) ]); type =
with lib.types;
attrsOf (oneOf [
str
int
bool
(listOf str)
]);
example = { example = {
audio = "alsa"; audio = "alsa";
rtcuseutc = "on"; rtcuseutc = "on";
@ -64,11 +77,21 @@ in {
''; '';
}; };
exportParams = lib.mkOption { exportParams = lib.mkOption {
type = with lib.types; listOf (oneOf [ str int bool (listOf str) ]); type =
with lib.types;
listOf (oneOf [
str
int
bool
(listOf str)
]);
example = [ example = [
"--vsys" "0" "--vendor" "ACME Inc." "--vsys"
"0"
"--vendor"
"ACME Inc."
]; ];
default = []; default = [ ];
description = '' description = ''
Parameters passed to the Virtualbox export command. Parameters passed to the Virtualbox export command.
@ -86,7 +109,8 @@ in {
mountPoint = "/home/demo/storage"; mountPoint = "/home/demo/storage";
size = 100 * 1024; size = 100 * 1024;
}; };
type = lib.types.nullOr (lib.types.submodule { type = lib.types.nullOr (
lib.types.submodule {
options = { options = {
size = lib.mkOption { size = lib.mkOption {
type = lib.types.int; type = lib.types.int;
@ -102,7 +126,8 @@ in {
description = "Path where to mount this disk."; description = "Path where to mount this disk.";
}; };
}; };
}); }
);
}; };
postExportCommands = lib.mkOption { postExportCommands = lib.mkOption {
type = lib.types.lines; type = lib.types.lines;
@ -122,7 +147,14 @@ in {
''; '';
}; };
storageController = lib.mkOption { storageController = lib.mkOption {
type = with lib.types; attrsOf (oneOf [ str int bool (listOf str) ]); type =
with lib.types;
attrsOf (oneOf [
str
int
bool
(listOf str)
]);
example = { example = {
name = "SCSI"; name = "SCSI";
add = "scsi"; add = "scsi";
@ -175,8 +207,7 @@ in {
diskSize = cfg.baseImageSize; diskSize = cfg.baseImageSize;
additionalSpace = "${toString cfg.baseImageFreeSpace}M"; additionalSpace = "${toString cfg.baseImageFreeSpace}M";
postVM = postVM = ''
''
export HOME=$PWD export HOME=$PWD
export PATH=${pkgs.virtualbox}/bin:$PATH export PATH=${pkgs.virtualbox}/bin:$PATH
@ -225,13 +256,15 @@ in {
''; '';
}; };
fileSystems = { fileSystems =
{
"/" = { "/" = {
device = "/dev/disk/by-label/nixos"; device = "/dev/disk/by-label/nixos";
autoResize = true; autoResize = true;
fsType = "ext4"; fsType = "ext4";
}; };
} // (lib.optionalAttrs (cfg.extraDisk != null) { }
// (lib.optionalAttrs (cfg.extraDisk != null) {
${cfg.extraDisk.mountPoint} = { ${cfg.extraDisk.mountPoint} = {
device = "/dev/disk/by-label/" + cfg.extraDisk.label; device = "/dev/disk/by-label/" + cfg.extraDisk.label;
autoResize = true; autoResize = true;
@ -242,10 +275,12 @@ in {
boot.growPartition = true; boot.growPartition = true;
boot.loader.grub.device = "/dev/sda"; boot.loader.grub.device = "/dev/sda";
swapDevices = [{ swapDevices = [
{
device = "/var/swap"; device = "/var/swap";
size = 2048; size = 2048;
}]; }
];
virtualisation.virtualbox.guest.enable = true; virtualisation.virtualbox.guest.enable = true;