Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1e69c8c24273
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 11f49fb94d39
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 13, 2020

  1. nixos/bcache: Installer test for / on bcache

    @chkno
    chkno committed Feb 13, 2020
    Copy the full SHA
    f6e9dee View commit details

Commits on May 12, 2020

  1. Merge pull request #79966 from chkno/bcache 

    nixos/bcache: Installer test for / on bcache
    @tfc
    tfc authored May 12, 2020
    Copy the full SHA
    11f49fb View commit details
Showing with 26 additions and 0 deletions.
  1. +26 −0 nixos/tests/installer.nix
26 changes: 26 additions & 0 deletions nixos/tests/installer.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = ''