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

Fixed size debug information. Apparently that comes part of lsblk.. heh

This commit is contained in:
Anton Hvornum 2019-06-09 21:30:17 +02:00
parent 92e71cf599
commit f00e9ee9e3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archinstall.py
View File

@ -290,7 +290,8 @@ def device_state(name):
def grab_partitions(dev): def grab_partitions(dev):
drive_name = os.path.basename(dev) drive_name = os.path.basename(dev)
parts = oDict() parts = oDict()
o = b''.join(sys_command('/usr/bin/lsblk -o name -J -b {dev}'.format(dev=dev)).exec()) #o = b''.join(sys_command('/usr/bin/lsblk -o name -J -b {dev}'.format(dev=dev)).exec())
o = b''.join(sys_command('/usr/bin/lsblk -J {dev}'.format(dev=dev)).exec())
if b'not a block device' in o: if b'not a block device' in o:
## TODO: Replace o = sys_command() with code, o = sys_command() ## TODO: Replace o = sys_command() with code, o = sys_command()
## and make sys_command() return the exit-code, way safer than checking output strings :P ## and make sys_command() return the exit-code, way safer than checking output strings :P
@ -303,10 +304,11 @@ def grab_partitions(dev):
r = json.loads(o.decode('UTF-8')) r = json.loads(o.decode('UTF-8'))
if len(r['blockdevices']) and 'children' in r['blockdevices'][0]: if len(r['blockdevices']) and 'children' in r['blockdevices'][0]:
for part in r['blockdevices'][0]['children']: for part in r['blockdevices'][0]['children']:
size = os.statvfs(dev + part['name'][len(drive_name):]) #size = os.statvfs(dev + part['name'][len(drive_name):])
parts[part['name'][len(drive_name):]] = { parts[part['name'][len(drive_name):]] = {
'size' : size.f_frsize * size.f_bavail, #'size' : size.f_frsize * size.f_bavail,
'blocksize' : size.f_frsize * size.f_blocks #'blocksize' : size.f_frsize * size.f_blocks
'size' : part['size']
} }
return parts return parts