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

Spelling errors, and filtered the output a bit.

This commit is contained in:
Anton Hvornum 2021-05-11 09:53:18 +02:00
parent dd52bfb3a7
commit 20d9858cf6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall/lib/disk.py
View File

@ -256,7 +256,7 @@ class Partition():
output = b"".join(sys_command(f"sfdisk --json {self.block_device.path}")) output = b"".join(sys_command(f"sfdisk --json {self.block_device.path}"))
output = json.loads(output.decode('UTF-8')) output = json.loads(output.decode('UTF-8'))
for partition in output.get('partitionstable', {}).get('partitions', []): for partition in output.get('partitiontable', {}).get('partitions', []):
if partition['node'] == self.path: if partition['node'] == self.path:
return partition['start']# * self.sector_size return partition['start']# * self.sector_size
@ -266,7 +266,7 @@ class Partition():
output = b"".join(sys_command(f"sfdisk --json {self.block_device.path}")) output = b"".join(sys_command(f"sfdisk --json {self.block_device.path}"))
output = json.loads(output.decode('UTF-8')) output = json.loads(output.decode('UTF-8'))
for partition in output.get('partitionstable', {}).get('partitions', []): for partition in output.get('partitiontable', {}).get('partitions', []):
if partition['node'] == self.path: if partition['node'] == self.path:
return partition['size']# * self.sector_size return partition['size']# * self.sector_size
@ -289,7 +289,7 @@ class Partition():
# } # }
# } # }
for partition in output.get('partitionstable', {}).get('partitions', []): for partition in output.get('partitiontable', {}).get('partitions', []):
if partition['node'] == self.path: if partition['node'] == self.path:
return partition.get('bootable', False) return partition.get('bootable', False)

4
archinstall/lib/user_interaction.py
View File

@ -592,7 +592,7 @@ def wipe_and_create_partitions(block_device):
else: else:
partition_type = 'msdos' partition_type = 'msdos'
partitions_result = [part.__dump__() for part in block_device.partitions] partitions_result = [part.__dump__() for part in block_device.partitions.values()]
suggested_layout = [ suggested_layout = [
{ # Boot { # Boot
"type" : "primary", "type" : "primary",
@ -641,7 +641,7 @@ def wipe_and_create_partitions(block_device):
if len(partitions_result): if len(partitions_result):
print('Current partition layout:') print('Current partition layout:')
for partition in partitions_result: for partition in partitions_result:
print(partition) print({key: val for key, val in partition.items() if val})
print() print()
task = generic_select(modes, task = generic_select(modes,