Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

block: fix support for device-mapper devices

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2014-06-07 04:54:15 +02:00
parent a1d6ce433a
commit fcc77167a9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/qubesutils.py
View File

@ -174,7 +174,7 @@ def block_name_to_majorminor(name):
return (0, 0) return (0, 0)
if not dXpY_style: if not dXpY_style:
name_match = re.match(r"^([a-z]+)([a-z])([0-9]*)$", name) name_match = re.match(r"^([a-z]+)([a-z-])([0-9]*)$", name)
else: else:
name_match = re.match(r"^([a-z]+)([0-9]*)(?:p([0-9]+))?$", name) name_match = re.match(r"^([a-z]+)([0-9]*)(?:p([0-9]+))?$", name)
if not name_match: if not name_match:
@ -217,7 +217,7 @@ def block_find_unused_frontend(vm = None):
return None return None
def block_list(vm = None, system_disks = False): def block_list(vm = None, system_disks = False):
device_re = re.compile(r"^[a-z0-9]{1,12}$") device_re = re.compile(r"^[a-z0-9-]{1,12}$")
# FIXME: any better idea of desc_re? # FIXME: any better idea of desc_re?
desc_re = re.compile(r"^.{1,255}$") desc_re = re.compile(r"^.{1,255}$")
mode_re = re.compile(r"^[rw]$") mode_re = re.compile(r"^[rw]$")