Add information about subvolume to BTRFS format

Signed-off-by: Vojtech Trefny <vtrefny@redhat.com>
storaged-project · Mar 18, 2015 · 796351c · 796351c
1 parent 8c8406c
commit 796351c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py
@@ -195,6 +195,7 @@ def __init__(self, *args, **kwargs):
                                     label=label,
                                     volUUID=self.uuid,
                                     device=self.path,
+                                    subvolspec=self.vol_id,
                                     mountopts="subvolid=%d" % self.vol_id)
             self.originalFormat = copy.copy(self.format)
 

diff --git a/blivet/devicetree.py b/blivet/devicetree.py
@@ -1740,6 +1740,7 @@ def handleBTRFSFormat(self, info, device):
 
                 fmt = getFormat("btrfs", device=btrfs_dev.path, exists=True,
                                 volUUID=btrfs_dev.format.volUUID,
+                                subvolspec=vol_path,
                                 mountopts="subvol=%s" % vol_path)
                 if vol_id in snapshot_ids:
                     device_class = BTRFSSnapShotDevice

diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
@@ -1123,6 +1123,7 @@ class BTRFS(FS):
     def __init__(self, **kwargs):
         super(BTRFS, self).__init__(**kwargs)
         self.volUUID = kwargs.pop("volUUID", None)
+        self.subvolspec = kwargs.pop("subvolspec", None)
 
     def create(self, **kwargs):
         # filesystem creation is done in storage.devicelibs.btrfs.create_volume