Skip to content

Commit 2be69e8

Browse files
committed
fstests: Better defaults for the fstests sparse device filename
The cloud provider settings now consistently provide the correct device pathnames for the /data and sparse devices. Set up the default pathname for the fstests sparse device properly for those cases. Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent a3370d5 commit 2be69e8

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

workflows/fstests/Kconfig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -539,13 +539,13 @@ config FSTESTS_SPARSE_DEV
539539
default "/dev/disk/by-id/virtio-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
540540
default "/dev/disk/by-id/ata-QEMU_HARDDISK_kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
541541
default "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_SCSI
542-
default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
543-
default "/dev/nvme1n1" if TERRAFORM_GCE
544-
default "/dev/sdd" if TERRAFORM_AZURE
542+
default TERRAFORM_AWS_SPARSE_VOLUME_DEVICE_FILE_NAME if TERRAFORM_AWS
543+
default TERRAFORM_GCE_SPARSE_VOLUME_DEVICE_FILE_NAME if TERRAFORM_GCE
544+
default TERRAFORM_AZURE_SPARSE_VOLUME_DEVICE_FILE_NAME if TERRAFORM_AZURE
545545
default TERRAFORM_OCI_SPARSE_VOLUME_DEVICE_FILE_NAME if TERRAFORM_OCI
546546
help
547-
The device to use to create a filesystem on where we will place
548-
sparse files.
547+
The device pathname to use to create a filesystem where
548+
fstests places sparse files.
549549

550550
choice
551551
prompt "Filesystem to use where sparse files will live"

0 commit comments

Comments
 (0)