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

Created has_partitions() on BlockDevice's

This commit is contained in:
Anton Hvornum 2021-02-07 12:52:12 +01:00
parent a618ebd611
commit fa2270a11b
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archinstall/lib/disk.py
View File

@ -100,6 +100,9 @@ class BlockDevice():
all_partitions = self.partitions all_partitions = self.partitions
return [all_partitions[k] for k in all_partitions] return [all_partitions[k] for k in all_partitions]
def has_partitions(self):
return len(self.partitions)
class Partition(): class Partition():
def __init__(self, path, part_id=None, size=-1, filesystem=None, mountpoint=None, encrypted=False): def __init__(self, path, part_id=None, size=-1, filesystem=None, mountpoint=None, encrypted=False):

19
examples/guided.py
View File

@ -96,6 +96,16 @@ archinstall.storage['_guided']['mirrors'] = mirror_regions
# Ask which harddrive/block-device we will install to # Ask which harddrive/block-device we will install to
harddrive = archinstall.select_disk(archinstall.all_disks()) harddrive = archinstall.select_disk(archinstall.all_disks())
archinstall.storage['_guided']['harddrive'] = harddrive
if harddrive.has_partitions(harddrive):
archinstall.log(f" ! {harddrive} contains existing partitions", fg='red')
if (option := input('Do you wish to keep existing partition setup or format the entire disk? (k/f): ')).lower() in ('k', 'keep'):
print("We're keeping it!")
else:
print('Formatting woop woop!')
exit(1)
while (disk_password := getpass.getpass(prompt='Enter disk encryption password (leave blank for no encryption): ')): while (disk_password := getpass.getpass(prompt='Enter disk encryption password (leave blank for no encryption): ')):
disk_password_verification = getpass.getpass(prompt='And one more time for verification: ') disk_password_verification = getpass.getpass(prompt='And one more time for verification: ')
if disk_password != disk_password_verification: if disk_password != disk_password_verification:
@ -103,15 +113,6 @@ while (disk_password := getpass.getpass(prompt='Enter disk encryption password (
continue continue
archinstall.storage['_guided']['disk_encryption'] = True archinstall.storage['_guided']['disk_encryption'] = True
break break
archinstall.storage['_guided']['harddrive'] = harddrive
print(harddrive)
if archinstall.has_partitions(harddrive):
archinstall.log(f" ! {harddrive} contains existing partitions", fg='red')
if (option := input('Do you wish to keep existing partition setup or format the entire disk? (k/f): ')).lower() in ('k', 'keep'):
print("We're keeping it!")
else:
print('Formatting woop woop!')
exit(1)
# Ask for a hostname # Ask for a hostname