Skip to content
Permalink
Browse files

Issue 564: Improve openmediavault.fs.Filesystem::get_parent_device_fi…

…le() to handle BTRFS subvolumes.

Fixes: #564
  • Loading branch information
votdev committed Jan 13, 2020
1 parent dc493c8 commit 59052779d20c840066bb7b11909a96cbea5b3cef
@@ -1,3 +1,10 @@
openmediavault (5.2.3-2) unstable; urgency=low

* Issue 564: Improve openmediavault.fs.Filesystem::get_parent_device_file()
to handle BTRFS subvolumes.

-- Volker Theile <volker.theile@openmediavault.org> Mon, 13 Jan 2020 23:05:01 +0100

openmediavault (5.2.3-1) unstable; urgency=low

* Issue 564: Improve openmediavault.fs.Filesystem::get_parent_device_file()
@@ -175,7 +175,7 @@ def get_parent_device_file(self):
# filetree and not a block device (and cannot be treated as one).
# Try to get the parent device manually.
# Check if we are processing a 'sd' driver device.
if re.match(r'^sd\d+$', self.device_name(True)):
if re.match(r'^sd[a-z]+\d+$', self.device_name(True)):
# Simply cut-off the partition from the name of the device file.
return re.sub(r'\d+', '', self.canonical_device_file)
raise e

0 comments on commit 5905277

Please sign in to comment.
You can’t perform that action at this time.