[PATCH 1/2] Use format.mountpoint for BTRFS listSubVolumes

Vojtech Trefny vtrefny at redhat.com
Mon Dec 8 14:24:49 UTC 2014


Signed-off-by: Vojtech Trefny <vtrefny at redhat.com>
---
 blivet/devices/btrfs.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py
index 5061af1..a74138e 100644
--- a/blivet/devices/btrfs.py
+++ b/blivet/devices/btrfs.py
@@ -313,16 +313,18 @@ class BTRFSVolumeDevice(BTRFSDevice, ContainerDevice, RaidDevice):
             except errors.FSError as e:
                 log.debug("btrfs temp mount failed: %s", e)
                 return subvols
-        elif not self.originalFormat.status:
+        elif not (self.originalFormat.status or self.format.status):
             return subvols
 
         try:
-            subvols = btrfs.list_subvolumes(self.originalFormat._mountpoint,
+            mountpoint = (self.originalFormat._mountpoint or
+                          self.format._mountpoint)
+            subvols = btrfs.list_subvolumes(mountpoint,
                                             snapshots_only=snapshotsOnly)
         except errors.BTRFSError as e:
             log.debug("failed to list subvolumes: %s", e)
         else:
-            self._getDefaultSubVolumeID()
+            self._getDefaultSubVolumeID(mountpoint)
         finally:
             if flags.installer_mode:
                 self._undo_temp_mount()
@@ -341,10 +343,12 @@ class BTRFSVolumeDevice(BTRFSDevice, ContainerDevice, RaidDevice):
     def removeSubVolume(self, name):
         raise NotImplementedError()
 
-    def _getDefaultSubVolumeID(self):
+    def _getDefaultSubVolumeID(self, mountpoint=None):
         subvolid = None
+        if not mountpoint:
+            mountpoint = self.originalFormat._mountpoint
         try:
-            subvolid = btrfs.get_default_subvolume(self.originalFormat._mountpoint)
+            subvolid = btrfs.get_default_subvolume(mountpoint)
         except errors.BTRFSError as e:
             log.debug("failed to get default subvolume id: %s", e)
 
-- 
2.1.0



More information about the anaconda-patches mailing list