Skip to content

Commit 23f0c8c

Browse files
committed
proper check for enc_type
1 parent c7c838e commit 23f0c8c

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

archinstall/lib/disk/encryption_menu.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def _preview(self, item: MenuItem) -> str | None:
163163
if (enc_pwd := self._prev_password()) is not None:
164164
output += f'\n{enc_pwd}'
165165

166-
if (enc_type := self._prev_type()) is not None and enc_type != EncryptionType.NoEncryption and (iter_time := self._prev_iter_time()) is not None:
166+
if (iter_time := self._prev_iter_time()) is not None:
167167
output += f'\n{iter_time}'
168168

169169
if (fido_device := self._prev_hsm()) is not None:
@@ -229,8 +229,9 @@ def _prev_hsm(self) -> str | None:
229229

230230
def _prev_iter_time(self) -> str | None:
231231
iter_time = self._item_group.find_by_key('iter_time').value
232+
enc_type = self._item_group.find_by_key('encryption_type').value
232233

233-
if iter_time:
234+
if iter_time and enc_type != EncryptionType.NoEncryption:
234235
return f'{tr("Iteration time")}: {iter_time}ms'
235236

236237
return None

archinstall/lib/interactions/general_conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ def ask_hostname(preset: str | None = None) -> str | None:
6161
alignment=Alignment.CENTER,
6262
allow_skip=True,
6363
default_text=preset,
64+
validator=lambda x: x if len(x) > 0 else tr('Hostname cannot be empty'),
6465
).input()
6566

6667
match result.type_:

0 commit comments

Comments
 (0)