From 9b6d7021a89116f09ad5324f19d7d08b9ec2856b Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 13 Jun 2021 10:37:30 +0200 Subject: This fixes https://github.com/archlinux/archinstall/pull/426#discussion_r650372664 --- archinstall/lib/installer.py | 7 ++++--- examples/guided.py | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 91c55b33..b1e38dc6 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -125,10 +125,11 @@ class Installer: return True - def mount_ordered_layout(self, layout :dict): + def mount_ordered_layout(self, layouts :dict): mountpoints = {} - for partition in layout['partitions']: - mountpoints[partition['mountpoint']] = partition['device_instance'] + for blockdevice in layouts: + for partition in layouts[blockdevice]['partitions']: + mountpoints[partition['mountpoint']] = partition['device_instance'] for mountpoint in sorted(mountpoints.keys()): mountpoints[mountpoint].mount(f"{self.target}{mountpoint}") diff --git a/examples/guided.py b/examples/guided.py index 5a9f2b49..14cbe0a1 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -236,8 +236,7 @@ def perform_installation(mountpoint): with archinstall.Installer(mountpoint, kernels=archinstall.arguments.get('kernels', 'linux')) as installation: # Mount all the drives to the desired mountpoint # This *can* be done outside of the installation, but the installer can deal with it. - for drive in archinstall.arguments['harddrives']: - installation.mount_ordered_layout(archinstall.storage['disk_layouts'][drive]) + installation.mount_ordered_layout(archinstall.storage['disk_layouts']) # if len(mirrors): # Certain services might be running that affects the system during installation. -- cgit v1.2.3-70-g09d2