Skip to content

Commit 558703b

Browse files
thaJeztahdims
authored andcommitted
container/podman: fix zfsFilesystem and zfsParent being swapped.
`DetermineDeviceStorage` was introduced in 1fb7f23 and returns `rootfsStorageDir, zfsFilesystem, zfsParent`. But the PodMan implementation added in fea8256 assigns them to `rootfsStorageDir, zfsParent, zfsFilesystem`, so the `zfsParent` and `zfsFilesystem` being reversed. I'm not sure how to best verify this, but from the looks of it, that's a bug, so updating the code to assign the right values. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent fd4eb37 commit 558703b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

container/podman/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func newPodmanContainerHandler(
118118
return nil, err
119119
}
120120

121-
rootfsStorageDir, zfsParent, zfsFilesystem, err := determineDeviceStorage(storageDriver, storageDir, rwLayerID)
121+
rootfsStorageDir, zfsFilesystem, zfsParent, err := determineDeviceStorage(storageDriver, storageDir, rwLayerID)
122122
if err != nil {
123123
return nil, err
124124
}

0 commit comments

Comments
 (0)