Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/examples/guided.py
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2021-06-10 13:39:50 +0200
committerAnton Hvornum <anton.feeds@gmail.com>2021-06-10 13:39:50 +0200
commite8d38ea1a75a33d820ac32c995a80c1bc833a44d (patch)
tree8666ba1fb2c24036edf0a1c93c2981bce6ab2885 /examples/guided.py
parent5701ef953919230f1478294cabcc66ccdbe95e34 (diff)
Started working on partitioning logic from declarative layouts.
Diffstat (limited to 'examples/guided.py')
-rw-r--r--examples/guided.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/examples/guided.py b/examples/guided.py
index b4c12fd6..57d4818b 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -73,7 +73,7 @@ def ask_user_questions():
# Ask which harddrives/block-devices we will install to
# and convert them into archinstall.BlockDevice() objects.
if archinstall.arguments.get('harddrives', None):
- archinstall.arguments['harddrives'] = [archinstall.BlockDevice(BlockDev) for BlockDev in archinstall.arguments['harddrives']]
+ archinstall.arguments['harddrives'] = [archinstall.BlockDevice(BlockDev) for BlockDev in archinstall.arguments['harddrives'].split(',')]
else:
archinstall.arguments['harddrives'] = archinstall.generic_multi_select(archinstall.all_disks(),
text="Select one or more harddrives to use and configure (leave blank to skip this step): ",
@@ -82,7 +82,6 @@ def ask_user_questions():
if archinstall.arguments.get('harddrives', None):
archinstall.storage['disk_layouts'] = archinstall.select_disk_layout(archinstall.arguments['harddrives'])
-
# Get disk encryption password (or skip if blank)
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): ')):
@@ -219,7 +218,7 @@ def perform_filesystem_operations():
for drive in archinstall.arguments['harddrives']:
with archinstall.Filesystem(drive, mode) as fs:
- fs.load_layout(archinstall.arguments['harddrives'][drive])
+ fs.load_layout(archinstall.storage['disk_layouts'][drive])
perform_installation(archinstall.storage.get('MOUNT_POINT', '/mnt'))