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

Moved sorted logic for partitions

This commit is contained in:
Anton Hvornum 2019-06-09 21:38:03 +02:00
parent 5cdbb79ed6
commit 0bd4beceba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall.py
View File

@ -303,7 +303,7 @@ 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 sorted(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,
@ -537,7 +537,7 @@ if __name__ == '__main__':
if len(args['paritions']) <= 0: if len(args['paritions']) <= 0:
print('[E] No paritions were created on {drive}'.format(**args), o) print('[E] No paritions were created on {drive}'.format(**args), o)
exit(1) exit(1)
for index, part_name in enumerate(args['paritions']): # TODO: sorted() here instead? Just to be safe? o0 for index, part_name in enumerate(sorted(args['paritions'].keys())):
args['partition_{}'.format(index+1)] = part_name args['partition_{}'.format(index+1)] = part_name
o = b''.join(sys_command('/usr/bin/mkfs.vfat -F32 {drive}{partition_1}'.format(**args)).exec()) o = b''.join(sys_command('/usr/bin/mkfs.vfat -F32 {drive}{partition_1}'.format(**args)).exec())