Merge pull request #2359 from OSInside/fix_btrfs_data_sync

Fixed mounting of subvolumes for data sync
OSInside · Aug 23, 2023 · 472160b · 472160b
2 parents faa2a23 + aac9412
commit 472160b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/build-tests/x86/fedora/test-image-live-disk/appliance.kiwi b/build-tests/x86/fedora/test-image-live-disk/appliance.kiwi
@@ -34,6 +34,7 @@
             <systemdisk name="fedora">
                 <volume name="@root=root"/>
                 <volume name="home" parent="/"/>
+                <volume name="var" parent="/"/>
             </systemdisk>
             <oemconfig>
                 <oem-resize>false</oem-resize>

diff --git a/kiwi/volume_manager/btrfs.py b/kiwi/volume_manager/btrfs.py
@@ -229,6 +229,7 @@ def create_volumes(self, filesystem_name):
                 )
 
                 volume_mountpoint = toplevel
+                root_is_snapshot = self.custom_args['root_is_snapshot']
 
                 attributes = {
                     'parent': volume.parent or '',
@@ -239,7 +240,7 @@ def create_volumes(self, filesystem_name):
                     ).lstrip(os.sep),
                     'subvol_name': volume.name
                 }
-                if self.custom_args['root_is_snapshot']:
+                if root_is_snapshot:
                     volume_mountpoint = self.mountpoint + \
                         f'/{self.root_volume_name}/.snapshots/1/snapshot/'
                     attributes = {
@@ -255,7 +256,13 @@ def create_volumes(self, filesystem_name):
                     device=self.device,
                     attributes=attributes,
                     mountpoint=os.path.normpath(
-                        volume_mountpoint + os.sep + volume.realpath
+                        os.sep.join(
+                            [
+                                volume_mountpoint,
+                                self.root_volume_name if not root_is_snapshot else '',
+                                volume.realpath
+                            ]
+                        )
                     )
                 )
                 self.subvol_mount_list.append(