Removed obsolete variable in prep for multi-disk support.

This commit is contained in:
Anton Hvornum 2021-05-06 14:20:20 +02:00
parent 8bc3dd685e
commit c20be61e12
2 changed files with 2 additions and 3 deletions

View File

@ -30,7 +30,6 @@ class BlockDevice():
# TODO: Currently disk encryption is a BIT misleading.
# It's actually partition-encryption, but for future-proofing this
# I'm placing the encryption password on a BlockDevice level.
self.encryption_password = None
def __repr__(self, *args, **kwargs):
return f"BlockDevice({self.device})"

View File

@ -57,10 +57,10 @@ def ask_user_questions():
archinstall.storage['disk_layouts'] = archinstall.select_disk_layout(archinstall.arguments['harddrives'])
# Get disk encryption password (or skip if blank)
if archinstall.arguments['harddrive'] and archinstall.arguments.get('!encryption-password', None) is None:
if archinstall.arguments['harddrives'] and archinstall.arguments.get('!encryption-password', None) is None:
if (passwd := archinstall.get_password(prompt='Enter disk encryption password (leave blank for no encryption): ')):
archinstall.arguments['!encryption-password'] = passwd
archinstall.arguments['harddrive'].encryption_password = archinstall.arguments['!encryption-password']
archinstall.arguments["bootloader"] = archinstall.ask_for_bootloader()
# Get the hostname for the machine
if not archinstall.arguments.get('hostname', None):