nixos/tests/installer: add bpool for grub files in zfsroot test

authored by misuzu.tngl.sh and committed by

Jörg Thalheim e0d3bcbb b8a547d3

+16 -4
+16 -4
nixos/tests/installer.nix
··· 686 createPartitions = '' 687 machine.succeed( 688 "flock /dev/vda parted --script /dev/vda -- mklabel msdos" 689 - + " mkpart primary linux-swap 1M 1024M" 690 - + " mkpart primary 1024M -1s", 691 "udevadm settle", 692 - "mkswap /dev/vda1 -L swap", 693 "swapon -L swap", 694 - "zpool create rpool /dev/vda2", 695 "zfs create -o mountpoint=legacy rpool/root", 696 "mount -t zfs rpool/root /mnt", 697 "zfs create -o mountpoint=legacy rpool/root/usr", 698 "mkdir /mnt/usr", 699 "mount -t zfs rpool/root/usr /mnt/usr", 700 "udevadm settle", 701 ) 702 ''; 703 }; 704
··· 686 createPartitions = '' 687 machine.succeed( 688 "flock /dev/vda parted --script /dev/vda -- mklabel msdos" 689 + + " mkpart primary 1M 100MB" # bpool 690 + + " mkpart primary linux-swap 100M 1024M" 691 + + " mkpart primary 1024M -1s", # rpool 692 "udevadm settle", 693 + "mkswap /dev/vda2 -L swap", 694 "swapon -L swap", 695 + "zpool create rpool /dev/vda3", 696 "zfs create -o mountpoint=legacy rpool/root", 697 "mount -t zfs rpool/root /mnt", 698 "zfs create -o mountpoint=legacy rpool/root/usr", 699 "mkdir /mnt/usr", 700 "mount -t zfs rpool/root/usr /mnt/usr", 701 + "zpool create -o compatibility=grub2 bpool /dev/vda1", 702 + "zfs create -o mountpoint=legacy bpool/boot", 703 + "mkdir /mnt/boot", 704 + "mount -t zfs bpool/boot /mnt/boot", 705 "udevadm settle", 706 ) 707 + ''; 708 + 709 + # umount & export bpool before shutdown 710 + # this is a fix for "cannot import 'bpool': pool was previously in use from another system." 711 + postInstallCommands = '' 712 + machine.succeed("umount /mnt/boot") 713 + machine.succeed("zpool export bpool") 714 ''; 715 }; 716