diff --git a/mantle/cmd/kola/testiso.go b/mantle/cmd/kola/testiso.go index 1da8847e20..199091e26b 100644 --- a/mantle/cmd/kola/testiso.go +++ b/mantle/cmd/kola/testiso.go @@ -272,10 +272,13 @@ var verifyIsoVolumeId = `[Unit] Description=Verify ISO Volume ID OnFailure=emergency.target OnFailureJobMode=isolate +# only if we're actually mounting the ISO +ConditionPathIsMountPoint=/run/media/iso [Service] Type=oneshot RemainAfterExit=yes -ExecStart=bash -c "[[ $(lsblk -no LABEL /dev/sr0) == %s-* ]]" +# the backing device name is arch-dependent, but we know it's mounted on /run/media/iso +ExecStart=bash -c "[[ $(findmnt -no LABEL /run/media/iso) == %s-* ]]" [Install] RequiredBy=coreos-installer.target`