RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #695 from wllacer/master 

Solves issue #674
This commit is contained in:
Anton Hvornum 2021-11-09 07:49:30 +00:00 committed by GitHub
parent 8e5869d106 80a406c930
commit 992c945b52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
archinstall/lib/disk/blockdevice.py
View File

@ -5,6 +5,8 @@ from ..exceptions import DiskError
from ..output import log
from ..general import SysCommand
GIGA=2**30
class BlockDevice:
def __init__(self, path, info=None):
if not info:
@ -152,20 +154,11 @@ class BlockDevice:
return partition.get('uuid', None)
def convert_size_to_gb(self, size):
units = {
'P' : lambda s : float(s) * 2048,
'T' : lambda s : float(s) * 1024,
'G' : lambda s : float(s),
'M' : lambda s : float(s) / 1024,
'K' : lambda s : float(s) / 2048,
'B' : lambda s : float(s) / 3072,
}
unit = size[-1]
return float(units.get(unit, lambda s : None)(size[:-1]))
return round(size / GIGA,1)
@property
def size(self):
output = json.loads(SysCommand(f"lsblk --json -o+SIZE {self.path}").decode('UTF-8'))
output = json.loads(SysCommand(f"lsblk --json -b -o+SIZE {self.path}").decode('UTF-8'))
for device in output['blockdevices']:
return self.convert_size_to_gb(device['size'])