Merge pull request #1204 from stgraber/main

incusd/storage/zfs: Make sure the zvol is a block device
lxc · Sep 9, 2024 · 8db6c73 · 8db6c73
2 parents e213b73 + 40ba91f
commit 8db6c73
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/internal/server/storage/drivers/driver_zfs_volumes.go b/internal/server/storage/drivers/driver_zfs_volumes.go
@@ -1874,7 +1874,7 @@ func (d *zfs) tryGetVolumeDiskPathFromDataset(ctx context.Context, dataset strin
 
 func (d *zfs) getVolumeDiskPathFromDataset(dataset string) (string, error) {
 	// Shortcut for udev.
-	if util.PathExists(filepath.Join("/dev/zvol", dataset)) {
+	if util.PathExists(filepath.Join("/dev/zvol", dataset)) && linux.IsBlockdevPath(filepath.Join("/dev/zvol", dataset)) {
 		return filepath.Join("/dev/zvol", dataset), nil
 	}
 
@@ -1914,7 +1914,7 @@ func (d *zfs) getVolumeDiskPathFromDataset(dataset string) (string, error) {
 			continue
 		}
 
-		if strings.TrimSpace(output) == dataset {
+		if strings.TrimSpace(output) == dataset && linux.IsBlockdevPath(entryPath) {
 			return entryPath, nil
 		}
 	}