storage: cockpit-integration: do not overwrite request object structu…

…re - only extend it Resolves: rhbz#2264419
KKoukiou · Apr 10, 2024 · 0f1829a · 0f1829a
1 parent 89517d3
commit 0f1829a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/components/storage/CockpitStorageIntegration.jsx b/src/components/storage/CockpitStorageIntegration.jsx
@@ -178,6 +178,7 @@ export const preparePartitioning = async ({ devices, newMountPoints }) => {
 
                 if (existingRequestIndex !== -1) {
                     requests[existingRequestIndex] = {
+                        ...requests[existingRequestIndex],
                         "device-spec": cockpit.variant("s", deviceSpec),
                         "mount-point": cockpit.variant("s", dir || type),
                     };

diff --git a/test/check-storage b/test/check-storage
@@ -1311,6 +1311,13 @@ class TestStorageCockpitIntegration(anacondalib.VirtInstallMachineCase, StorageC
         r.check_disk_row(dev, "root, 15.0 GB: mount, /")
         r.check_disk_row(dev, "home, 15.0 GB: mount, /home")
 
+        # Check fstab
+        fstab = m.execute("cat /etc/fstab")
+        self.assertTrue("/mnt/sysroot/boot auto noauto 0 0" in fstab)
+        self.assertTrue("/mnt/sysroot/btrfs-mount-test auto subvol=/ 0 0" in fstab)
+        self.assertTrue("/mnt/sysroot btrfs noauto,subvol=root 0 0" in fstab)
+        self.assertTrue("/mnt/sysroot/home btrfs noauto,subvol=home 0 0" in fstab)
+
     @nondestructive
     def testBtrfsAndMountPointAssignment(self):
         b = self.browser