Merge pull request #1298 from vojtechtrefny/main_fsminsize-check-fix

Do not raise libblockdev errors in FSMinSize tasks (#2314637)
storaged-project · Sep 26, 2024 · 83c7ff8 · 83c7ff8
2 parents 85785ce + 4c03ebd
commit 83c7ff8
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/blivet/tasks/fsminsize.py b/blivet/tasks/fsminsize.py
@@ -58,7 +58,11 @@ def do_task(self):  # pylint: disable=arguments-differ
         if error_msgs:
             raise FSError("\n".join(error_msgs))
 
-        return Size(BlockDev.fs.ext2_get_min_size(self.fs.device))
+        try:
+            min_size = Size(BlockDev.fs.ext2_get_min_size(self.fs.device))
+        except BlockDev.FSError as e:
+            raise FSError("failed to get fs min size: %s" % e)
+        return min_size
 
 
 class NTFSMinSize(FSMinSize):
@@ -69,7 +73,11 @@ def do_task(self):  # pylint: disable=arguments-differ
         if error_msgs:
             raise FSError("\n".join(error_msgs))
 
-        return Size(BlockDev.fs.ntfs_get_min_size(self.fs.device))
+        try:
+            min_size = Size(BlockDev.fs.ntfs_get_min_size(self.fs.device))
+        except BlockDev.FSError as e:
+            raise FSError("failed to get fs min size: %s" % e)
+        return min_size
 
 
 class UnimplementedFSMinSize(fstask.UnimplementedFSTask):