fstab: Fix setting mount options for devices

storaged-project · Feb 6, 2025 · fe7af80 · fe7af80
1 parent 3fefa2b
commit fe7af80
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/blivet/fstab.py b/blivet/fstab.py
@@ -404,6 +404,8 @@ def entry_from_device(self, device):
         else:
             entry.vfstype = device.format.type
 
+        entry.mntops = device.format.options
+
         return entry
 
     def entry_from_action(self, action):
@@ -445,6 +447,8 @@ def entry_from_action(self, action):
         else:
             entry.vfstype = action.device.format.type
 
+        entry.mntops = action.device.format.options
+
         return entry
 
     def read(self):

diff --git a/tests/unit_tests/fstab_test.py b/tests/unit_tests/fstab_test.py
@@ -95,7 +95,11 @@ def test_entry_from_device(self):
         device.format.mountpoint = "/media/fstab_test"
 
         _entry = self.fstab.entry_from_device(device)
-        self.assertEqual(_entry, FSTabEntry('/dev/test_device', '/media/fstab_test', 'ext4', None, 0, 0))
+        self.assertEqual(_entry, FSTabEntry('/dev/test_device', '/media/fstab_test', 'ext4', 'defaults', 0, 0))
+
+        device.format.options = "noatime,ro"
+        _entry = self.fstab.entry_from_device(device)
+        self.assertEqual(_entry, FSTabEntry('/dev/test_device', '/media/fstab_test', 'ext4', ['noatime', 'ro'], 0, 0))
 
     def test_entry_from_device_stratis(self):
         pool = StratisPoolDevice("testpool", parents=[], exists=True)
@@ -104,7 +108,7 @@ def test_entry_from_device_stratis(self):
         device.format.mountpoint = "/media/fstab_test"
 
         _entry = self.fstab.entry_from_device(device)
-        self.assertEqual(_entry, FSTabEntry('/dev/stratis/testpool/testfs', '/media/fstab_test', 'xfs', None, 0, 0))
+        self.assertEqual(_entry, FSTabEntry('/dev/stratis/testpool/testfs', '/media/fstab_test', 'xfs', device.format.options, 0, 0))
 
     def test_update(self):