| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/luks.py | 3 | ||||
| -rw-r--r-- | examples/guided.py | 4 |
diff --git a/archinstall/lib/luks.py b/archinstall/lib/luks.py index f4c787ab..ff5e2057 100644 --- a/archinstall/lib/luks.py +++ b/archinstall/lib/luks.py @@ -69,6 +69,7 @@ class luks2(): cmd_handle = sys_command(f'/usr/bin/cryptsetup -q -v --type luks2 --pbkdf argon2i --hash {hash_type} --key-size {key_size} --iter-time {iter_time} --key-file {os.path.abspath(key_file)} --use-urandom luksFormat {partition.path}') except SysCallError as err: if err.exit_code == 256: + log(f'{partition} is being used, trying to unmount and crypt-close the device and running one more attempt at encrypting the device.', level=LOG_LEVELS.Debug) # Partition was in use, unmount it and try again partition.unmount() @@ -81,9 +82,11 @@ class luks2(): for child in children: # Unmount the child location if child_mountpoint := child.get('mountpoint', None): + log(f'Unmounting {child_mountpoint}', level=LOG_LEVELS.Debug) sys_command(f"umount {child_mountpoint}") # And close it if possible. + log(f"Closing crypt device {child['name']}", level=LOG_LEVELS.Debug) sys_command(f"cryptsetup close {child['name']}") # Then try again to set up the crypt-device diff --git a/examples/guided.py b/examples/guided.py index 9339f969..74d413aa 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -305,8 +305,8 @@ def perform_installation(device, boot_partition, language, mirrors): if archinstall.arguments.get('packages', None) and archinstall.arguments.get('packages', None)[0] != '': installation.add_additional_packages(archinstall.arguments.get('packages', None)) - if archinstall.arguments.get('profile', None) and len(profile := archinstall.arguments.get('profile').strip()): - installation.install_profile(profile) + if archinstall.arguments.get('profile', None): + installation.install_profile(archinstall.arguments.get('profile', None)) if archinstall.arguments.get('users', None): for user in archinstall.arguments.get('users'): |