Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2021-05-06 14:20:20 +0200
committerAnton Hvornum <anton.feeds@gmail.com>2021-05-06 14:20:20 +0200
commitc20be61e124ccb3f2434c6dc61016524ed936c7c (patch)
tree42855104dc886ef65642036a26d96d84b91a121e
parent8bc3dd685eb89b3a166e25a31be33672b7126e82 (diff)
Removed obsolete variable in prep for multi-disk support.
-rw-r--r--archinstall/lib/disk.py1
-rw-r--r--examples/guided.py4
2 files changed, 2 insertions, 3 deletions
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index 44462a21..1865c4fb 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -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})"
diff --git a/examples/guided.py b/examples/guided.py
index 0f4d846c..069a89d5 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -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):