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

qvm-block extend use qubes.utils.parse_size

Browse Source
This commit is contained in:
Bahtiar `kalkin-` Gadimov 2016-09-02 19:21:04 +02:00
parent 818ed20248
commit 1cf701ff60
No known key found for this signature in database
GPG Key ID: 96ED3C3BA19C3DEE
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qubes/tools/qvm_block.py
View File

@ -24,12 +24,12 @@
from __future__ import print_function from __future__ import print_function
import re
import sys import sys
import qubes import qubes
import qubes.exc import qubes.exc
import qubes.tools import qubes.tools
import qubes.utils
def prepare_table(vd_list, full=False): def prepare_table(vd_list, full=False):
@ -175,24 +175,7 @@ def extend_volumes(args):
''' '''
volume = args.volume volume = args.volume
app = args.app app = args.app
try: size = qubes.utils.parse_size(args.size)
size = int(args.size.strip())
except ValueError:
if re.match(r'^(\d+[kgm])$', args.size.strip(), re.IGNORECASE):
size = int(args.size.strip()[:-1])
factor = args.size.strip()[-1:]
elif re.match(r'^(\d+[kgm][B])$', args.size.strip(), re.IGNORECASE):
size = int(args.size.strip()[:-2])
factor = args.size.strip()[-2:-1]
else:
print("Unknown size %s" % args.size, file=sys.stderr)
sys.exit(1)
if factor == "K":
size *= 1000
elif factor == "M":
size *= 1000 * 1000
elif factor == "G":
size *= 1000 * 1000 * 1000
pool = app.get_pool(volume.pool) pool = app.get_pool(volume.pool)
pool.resize(volume, volume.size+size) pool.resize(volume, volume.size+size)
app.save() app.save()