nixos/stage-1-systemd: Add LVM2 support
This commit is contained in:
parent
65cc198539
commit
2633e82e1a
|
@ -21,6 +21,10 @@ in {
|
||||||
boot.vdo.enable = mkEnableOption "support for booting from VDOLVs";
|
boot.vdo.enable = mkEnableOption "support for booting from VDOLVs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
options.boot.initrd.services.lvm.enable = (mkEnableOption "enable booting from LVM2 in the initrd") // {
|
||||||
|
visible = false;
|
||||||
|
};
|
||||||
|
|
||||||
config = mkMerge [
|
config = mkMerge [
|
||||||
({
|
({
|
||||||
# minimal configuration file to make lvmconfig/lvm2-activation-generator happy
|
# minimal configuration file to make lvmconfig/lvm2-activation-generator happy
|
||||||
|
@ -31,8 +35,13 @@ in {
|
||||||
environment.systemPackages = [ cfg.package ];
|
environment.systemPackages = [ cfg.package ];
|
||||||
systemd.packages = [ cfg.package ];
|
systemd.packages = [ cfg.package ];
|
||||||
|
|
||||||
# TODO: update once https://github.com/NixOS/nixpkgs/pull/93006 was merged
|
|
||||||
services.udev.packages = [ cfg.package.out ];
|
services.udev.packages = [ cfg.package.out ];
|
||||||
|
|
||||||
|
# We need lvm2 for the device-mapper rules
|
||||||
|
boot.initrd.services.udev.packages = lib.mkIf config.boot.initrd.services.lvm.enable [ cfg.package ];
|
||||||
|
# The device-mapper rules want to call tools from lvm2
|
||||||
|
boot.initrd.systemd.initrdBin = lib.mkIf config.boot.initrd.services.lvm.enable [ cfg.package ];
|
||||||
|
boot.initrd.services.udev.binPackages = lib.mkIf config.boot.initrd.services.lvm.enable [ cfg.package ];
|
||||||
})
|
})
|
||||||
(mkIf cfg.dmeventd.enable {
|
(mkIf cfg.dmeventd.enable {
|
||||||
systemd.sockets."dm-event".wantedBy = [ "sockets.target" ];
|
systemd.sockets."dm-event".wantedBy = [ "sockets.target" ];
|
||||||
|
@ -47,13 +56,15 @@ in {
|
||||||
boot.initrd = {
|
boot.initrd = {
|
||||||
kernelModules = [ "dm-snapshot" "dm-thin-pool" ];
|
kernelModules = [ "dm-snapshot" "dm-thin-pool" ];
|
||||||
|
|
||||||
extraUtilsCommands = ''
|
systemd.initrdBin = lib.mkIf config.boot.initrd.services.lvm.enable [ pkgs.thin-provisioning-tools ];
|
||||||
|
|
||||||
|
extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) ''
|
||||||
for BIN in ${pkgs.thin-provisioning-tools}/bin/*; do
|
for BIN in ${pkgs.thin-provisioning-tools}/bin/*; do
|
||||||
copy_bin_and_libs $BIN
|
copy_bin_and_libs $BIN
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
extraUtilsCommandsTest = ''
|
extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable) ''
|
||||||
ls ${pkgs.thin-provisioning-tools}/bin/ | grep -v pdata_tools | while read BIN; do
|
ls ${pkgs.thin-provisioning-tools}/bin/ | grep -v pdata_tools | while read BIN; do
|
||||||
$out/bin/$(basename $BIN) --help > /dev/null
|
$out/bin/$(basename $BIN) --help > /dev/null
|
||||||
done
|
done
|
||||||
|
@ -71,13 +82,15 @@ in {
|
||||||
initrd = {
|
initrd = {
|
||||||
kernelModules = [ "kvdo" ];
|
kernelModules = [ "kvdo" ];
|
||||||
|
|
||||||
extraUtilsCommands = ''
|
systemd.initrdBin = lib.mkIf config.boot.initrd.services.lvm.enable [ pkgs.vdo ];
|
||||||
|
|
||||||
|
extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable)''
|
||||||
ls ${pkgs.vdo}/bin/ | grep -v adaptLVMVDO | while read BIN; do
|
ls ${pkgs.vdo}/bin/ | grep -v adaptLVMVDO | while read BIN; do
|
||||||
copy_bin_and_libs ${pkgs.vdo}/bin/$BIN
|
copy_bin_and_libs ${pkgs.vdo}/bin/$BIN
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
extraUtilsCommandsTest = ''
|
extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable)''
|
||||||
ls ${pkgs.vdo}/bin/ | grep -v adaptLVMVDO | while read BIN; do
|
ls ${pkgs.vdo}/bin/ | grep -v adaptLVMVDO | while read BIN; do
|
||||||
$out/bin/$(basename $BIN) --help > /dev/null
|
$out/bin/$(basename $BIN) --help > /dev/null
|
||||||
done
|
done
|
||||||
|
@ -91,7 +104,15 @@ in {
|
||||||
environment.systemPackages = [ pkgs.vdo ];
|
environment.systemPackages = [ pkgs.vdo ];
|
||||||
})
|
})
|
||||||
(mkIf (cfg.dmeventd.enable || cfg.boot.thin.enable) {
|
(mkIf (cfg.dmeventd.enable || cfg.boot.thin.enable) {
|
||||||
boot.initrd.preLVMCommands = ''
|
boot.initrd.systemd.contents."/etc/lvm/lvm.conf".text = optionalString (config.boot.initrd.services.lvm.enable && cfg.boot.thin.enable) (concatMapStringsSep "\n"
|
||||||
|
(bin: "global/${bin}_executable = /bin/${bin}")
|
||||||
|
[ "thin_check" "thin_dump" "thin_repair" "cache_check" "cache_dump" "cache_repair" ]
|
||||||
|
) + "\n" + optionalString cfg.dmeventd.enable ''
|
||||||
|
dmeventd/executable = /bin/false
|
||||||
|
activation/monitoring = 0
|
||||||
|
'';
|
||||||
|
|
||||||
|
boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) ''
|
||||||
mkdir -p /etc/lvm
|
mkdir -p /etc/lvm
|
||||||
cat << EOF >> /etc/lvm/lvm.conf
|
cat << EOF >> /etc/lvm/lvm.conf
|
||||||
${optionalString cfg.boot.thin.enable (
|
${optionalString cfg.boot.thin.enable (
|
||||||
|
|
|
@ -11,6 +11,24 @@ let
|
||||||
thinpool = { test = callTest ./thinpool.nix; kernelFilter = lib.id; };
|
thinpool = { test = callTest ./thinpool.nix; kernelFilter = lib.id; };
|
||||||
# we would like to test all versions, but the kernel module currently does not compile against the other versions
|
# we would like to test all versions, but the kernel module currently does not compile against the other versions
|
||||||
vdo = { test = callTest ./vdo.nix; kernelFilter = lib.filter (v: v == "5.15"); };
|
vdo = { test = callTest ./vdo.nix; kernelFilter = lib.filter (v: v == "5.15"); };
|
||||||
|
|
||||||
|
|
||||||
|
# systemd in stage 1
|
||||||
|
raid-sd-stage-1 = {
|
||||||
|
test = callTest ./systemd-stage-1.nix;
|
||||||
|
kernelFilter = lib.id;
|
||||||
|
flavour = "raid";
|
||||||
|
};
|
||||||
|
thinpool-sd-stage-1 = {
|
||||||
|
test = callTest ./systemd-stage-1.nix;
|
||||||
|
kernelFilter = lib.id;
|
||||||
|
flavour = "thinpool";
|
||||||
|
};
|
||||||
|
vdo-sd-stage-1 = {
|
||||||
|
test = callTest ./systemd-stage-1.nix;
|
||||||
|
kernelFilter = lib.filter (v: v == "5.15");
|
||||||
|
flavour = "vdo";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
lib.listToAttrs (
|
lib.listToAttrs (
|
||||||
|
@ -20,7 +38,7 @@ lib.listToAttrs (
|
||||||
v' = lib.replaceStrings [ "." ] [ "_" ] version;
|
v' = lib.replaceStrings [ "." ] [ "_" ] version;
|
||||||
in
|
in
|
||||||
lib.flip lib.mapAttrsToList tests (name: t:
|
lib.flip lib.mapAttrsToList tests (name: t:
|
||||||
lib.nameValuePair "lvm-${name}-linux-${v'}" (lib.optionalAttrs (builtins.elem version (t.kernelFilter kernelVersionsToTest)) (t.test { kernelPackages = pkgs."linuxPackages_${v'}"; }))
|
lib.nameValuePair "lvm-${name}-linux-${v'}" (lib.optionalAttrs (builtins.elem version (t.kernelFilter kernelVersionsToTest)) (t.test ({ kernelPackages = pkgs."linuxPackages_${v'}"; } // builtins.removeAttrs t [ "test" "kernelFilter" ])))
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
104
nixos/tests/lvm2/systemd-stage-1.nix
Normal file
104
nixos/tests/lvm2/systemd-stage-1.nix
Normal file
|
@ -0,0 +1,104 @@
|
||||||
|
{ kernelPackages ? null, flavour }: let
|
||||||
|
preparationCode = {
|
||||||
|
raid = ''
|
||||||
|
machine.succeed("vgcreate test_vg /dev/vdc /dev/vdd")
|
||||||
|
machine.succeed("lvcreate -L 512M --type raid0 test_vg -n test_lv")
|
||||||
|
'';
|
||||||
|
|
||||||
|
thinpool = ''
|
||||||
|
machine.succeed("vgcreate test_vg /dev/vdc")
|
||||||
|
machine.succeed("lvcreate -L 512M -T test_vg/test_thin_pool")
|
||||||
|
machine.succeed("lvcreate -n test_lv -V 16G --thinpool test_thin_pool test_vg")
|
||||||
|
'';
|
||||||
|
|
||||||
|
vdo = ''
|
||||||
|
machine.succeed("vgcreate test_vg /dev/vdc")
|
||||||
|
machine.succeed("lvcreate --type vdo -n test_lv -L 6G -V 12G test_vg/vdo_pool_lv")
|
||||||
|
'';
|
||||||
|
}.${flavour};
|
||||||
|
|
||||||
|
extraConfig = {
|
||||||
|
raid = {
|
||||||
|
boot.initrd.kernelModules = [
|
||||||
|
"dm-raid"
|
||||||
|
"raid0"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
thinpool = {
|
||||||
|
services.lvm = {
|
||||||
|
boot.thin.enable = true;
|
||||||
|
dmeventd.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
vdo = {
|
||||||
|
services.lvm = {
|
||||||
|
boot.vdo.enable = true;
|
||||||
|
dmeventd.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}.${flavour};
|
||||||
|
|
||||||
|
extraCheck = {
|
||||||
|
raid = ''
|
||||||
|
"test_lv" in machine.succeed("lvs --select segtype=raid0")
|
||||||
|
'';
|
||||||
|
|
||||||
|
thinpool = ''
|
||||||
|
"test_lv" in machine.succeed("lvs --select segtype=thin-pool")
|
||||||
|
'';
|
||||||
|
|
||||||
|
vdo = ''
|
||||||
|
"test_lv" in machine.succeed("lvs --select segtype=vdo")
|
||||||
|
'';
|
||||||
|
}.${flavour};
|
||||||
|
|
||||||
|
in import ../make-test-python.nix ({ pkgs, ... }: {
|
||||||
|
name = "lvm2-${flavour}-systemd-stage-1";
|
||||||
|
meta.maintainers = with pkgs.lib.maintainers; [ das_j ];
|
||||||
|
|
||||||
|
nodes.machine = { pkgs, lib, ... }: {
|
||||||
|
imports = [ extraConfig ];
|
||||||
|
# Use systemd-boot
|
||||||
|
virtualisation = {
|
||||||
|
emptyDiskImages = [ 8192 8192 ];
|
||||||
|
useBootLoader = true;
|
||||||
|
useEFIBoot = true;
|
||||||
|
};
|
||||||
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [ e2fsprogs ]; # for mkfs.ext4
|
||||||
|
boot = {
|
||||||
|
initrd.systemd = {
|
||||||
|
enable = true;
|
||||||
|
emergencyAccess = true;
|
||||||
|
};
|
||||||
|
initrd.services.lvm.enable = true;
|
||||||
|
kernelPackages = lib.mkIf (kernelPackages != null) kernelPackages;
|
||||||
|
};
|
||||||
|
|
||||||
|
specialisation.boot-lvm.configuration.virtualisation.bootDevice = "/dev/test_vg/test_lv";
|
||||||
|
};
|
||||||
|
|
||||||
|
testScript = ''
|
||||||
|
machine.wait_for_unit("multi-user.target")
|
||||||
|
# Create a VG for the root
|
||||||
|
${preparationCode}
|
||||||
|
machine.succeed("mkfs.ext4 /dev/test_vg/test_lv")
|
||||||
|
machine.succeed("mkdir -p /mnt && mount /dev/test_vg/test_lv /mnt && echo hello > /mnt/test && umount /mnt")
|
||||||
|
|
||||||
|
# Boot from LVM
|
||||||
|
machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-lvm.conf")
|
||||||
|
machine.succeed("sync")
|
||||||
|
machine.crash()
|
||||||
|
machine.wait_for_unit("multi-user.target")
|
||||||
|
|
||||||
|
# Ensure we have successfully booted from LVM
|
||||||
|
assert "(initrd)" in machine.succeed("systemd-analyze") # booted with systemd in stage 1
|
||||||
|
assert "/dev/mapper/test_vg-test_lv on / type ext4" in machine.succeed("mount")
|
||||||
|
assert "hello" in machine.succeed("cat /test")
|
||||||
|
${extraCheck}
|
||||||
|
'';
|
||||||
|
})
|
Loading…
Reference in a new issue