diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-14 09:25:16 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-14 09:25:25 +0200 |
commit | 92a26320e7b9bbfe781e222a17c518443f63316a (patch) | |
tree | db6e4fe7706ec8c065d7efe10e93b38ea1b149ba /nixos/tests/installer.nix | |
parent | 2006fd4fc5a20c72ab2166b2b4039307f4f54bcb (diff) | |
parent | 85a05878846b75254f97b8690c18a470cfe982f0 (diff) | |
download | nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.gz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.bz2 nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.lz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.xz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.zst nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/tests/installer.nix')
-rw-r--r-- | nixos/tests/installer.nix | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 8d1bfa96d03d..eef9abebf9f2 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -97,7 +97,7 @@ let def create_machine_named(name): - return create_machine({**default_flags, "name": "boot-after-install"}) + return create_machine({**default_flags, "name": name}) machine.start() @@ -650,6 +650,32 @@ in { ''; }; + bcache = makeInstallerTest "bcache" { + createPartitions = '' + machine.succeed( + "flock /dev/vda parted --script /dev/vda --" + + " mklabel msdos" + + " mkpart primary ext2 1M 50MB" # /boot + + " mkpart primary 50MB 512MB " # swap + + " mkpart primary 512MB 1024MB" # Cache (typically SSD) + + " mkpart primary 1024MB -1s ", # Backing device (typically HDD) + "modprobe bcache", + "udevadm settle", + "make-bcache -B /dev/vda4 -C /dev/vda3", + "echo /dev/vda3 > /sys/fs/bcache/register", + "echo /dev/vda4 > /sys/fs/bcache/register", + "udevadm settle", + "mkfs.ext3 -L nixos /dev/bcache0", + "mount LABEL=nixos /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir /mnt/boot", + "mount LABEL=boot /mnt/boot", + "mkswap -f /dev/vda2 -L swap", + "swapon -L swap", + ) + ''; + }; + # Test a basic install using GRUB 1. grub1 = makeInstallerTest "grub1" { createPartitions = '' |