Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall
diff options
context:
space:
mode:
authorvirtual-meme-machine <46010615+virtual-meme-machine@users.noreply.github.com>2022-08-01 07:56:08 +0000
committerGitHub <noreply@github.com>2022-08-01 09:56:08 +0200
commit956b34905b730d32eab839b7a4627ca0bb9e5b06 (patch)
tree67447d1f1b333f541a13b76b74b3b0ad2c115b81 /archinstall
parentcfea0d6d1a6f6b82fd4b65abd2124c8fc0530949 (diff)
- Fix KeyError exceptions (#1354)
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/installer.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 97c2492d..f874c7fa 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -631,7 +631,7 @@ class Installer:
mkinit.write(f"BINARIES=({' '.join(self.BINARIES)})\n")
mkinit.write(f"FILES=({' '.join(self.FILES)})\n")
- if not storage['arguments']['HSM']:
+ if not storage['arguments'].get('HSM'):
# For now, if we don't use HSM we revert to the old
# way of setting up encryption hooks for mkinitcpio.
# This is purely for stability reasons, we're going away from this.
@@ -673,7 +673,7 @@ class Installer:
self.HOOKS.remove('fsck')
if self.detect_encryption(partition):
- if storage['arguments']['HSM']:
+ if storage['arguments'].get('HSM'):
# Required bby mkinitcpio to add support for fido2-device options
self.pacstrap('libfido2')
@@ -737,7 +737,7 @@ class Installer:
# TODO: Use python functions for this
SysCommand(f'/usr/bin/arch-chroot {self.target} chmod 700 /root')
- if storage['arguments']['HSM']:
+ if storage['arguments'].get('HSM'):
# TODO:
# A bit of a hack, but we need to get vconsole.conf in there
# before running `mkinitcpio` because it expects it in HSM mode.
@@ -865,7 +865,7 @@ class Installer:
kernel_options = f"options"
- if storage['arguments']['HSM']:
+ if storage['arguments'].get('HSM'):
# Note: lsblk UUID must be used, not PARTUUID for sd-encrypt to work
kernel_options += f" rd.luks.name={real_device.uuid}=luksdev"
# Note: tpm2-device and fido2-device don't play along very well: