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

Merge remote-tracking branch 'qubesos/pr/149'

Browse Source 
* qubesos/pr/149:
  lvm->init_cache: fix incorrect max splits
  Fix service qubesd not working with some locales
This commit is contained in:
Marek Marczykowski-Górecki 2017-09-14 00:15:33 +02:00
commit 86681ba996
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubes/storage/lvm.py
View File

@ -142,7 +142,7 @@ class ThinPool(qubes.storage.Pool):
def init_cache(log=logging.getLogger('qubes.storage.lvm')): def init_cache(log=logging.getLogger('qubes.storage.lvm')):
cmd = ['lvs', '--noheadings', '-o', cmd = ['lvs', '--noheadings', '-o',
'vg_name,pool_lv,name,lv_size,data_percent,lv_attr,origin', 'vg_name,pool_lv,name,lv_size,data_percent,lv_attr,origin',
'--units', 'b', '--separator', ','] '--units', 'b', '--separator', ';']
if os.getuid() != 0: if os.getuid() != 0:
cmd.insert(0, 'sudo') cmd.insert(0, 'sudo')
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
@ -159,11 +159,11 @@ def init_cache(log=logging.getLogger('qubes.storage.lvm')):
for line in out.splitlines(): for line in out.splitlines():
line = line.decode().strip() line = line.decode().strip()
pool_name, pool_lv, name, size, usage_percent, attr, \ pool_name, pool_lv, name, size, usage_percent, attr, \
origin = line.split(',', 6) origin = line.split(';', 6)
if '' in [pool_name, pool_lv, name, size, usage_percent]: if '' in [pool_name, pool_lv, name, size, usage_percent]:
continue continue
name = pool_name + "/" + name name = pool_name + "/" + name
size = int(size[:-1]) size = int(size[:-1]) # Remove 'B' suffix
usage = int(size / 100 * float(usage_percent)) usage = int(size / 100 * float(usage_percent))
result[name] = {'size': size, 'usage': usage, 'pool_lv': pool_lv, result[name] = {'size': size, 'usage': usage, 'pool_lv': pool_lv,
'attr': attr, 'origin': origin} 'attr': attr, 'origin': origin}