tests: use mountpoint program to check for mountpoints

This commit is contained in:
Jörg Thalheim 2022-08-26 08:49:46 +02:00
parent 69f1337980
commit 05a90d4227
4 changed files with 4 additions and 4 deletions

View file

@ -5,6 +5,6 @@ makeDiskoTest {
disko-config = import ../example/luks-lvm.nix; disko-config = import ../example/luks-lvm.nix;
extraTestScript = '' extraTestScript = ''
machine.succeed("cryptsetup isLuks /dev/vdb2"); machine.succeed("cryptsetup isLuks /dev/vdb2");
machine.succeed("grep -qs '/mnt/home' /proc/mounts"); machine.succeed("mountpoint /mnt/home");
''; '';
} }

View file

@ -4,7 +4,7 @@
makeDiskoTest { makeDiskoTest {
disko-config = import ../example/lvm-raid.nix; disko-config = import ../example/lvm-raid.nix;
extraTestScript = '' extraTestScript = ''
machine.succeed("grep -qs '/mnt/home' /proc/mounts"); machine.succeed("mountpoint /mnt/home");
''; '';
extraConfig = { extraConfig = {
boot.kernelModules = [ "dm-raid" "dm-mirror" ]; boot.kernelModules = [ "dm-raid" "dm-mirror" ];

View file

@ -5,6 +5,6 @@ makeDiskoTest {
disko-config = import ../example/mdadm.nix; disko-config = import ../example/mdadm.nix;
extraTestScript = '' extraTestScript = ''
machine.succeed("test -b /dev/md/raid1"); machine.succeed("test -b /dev/md/raid1");
machine.succeed("grep -qs '/mnt/raid' /proc/mounts"); machine.succeed("mountpoint /mnt/raid");
''; '';
} }

View file

@ -5,6 +5,6 @@ makeDiskoTest {
disko-config = import ../example/zfs.nix; disko-config = import ../example/zfs.nix;
extraTestScript = '' extraTestScript = ''
machine.succeed("test -b /dev/zvol/zroot/zfs_testvolume"); machine.succeed("test -b /dev/zvol/zroot/zfs_testvolume");
machine.succeed("grep -qs '/mnt/ext4onzfs' /proc/mounts"); machine.succeed("mountpoint /mnt/ext4onzfs");
''; '';
} }