RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing un-encrypted drives matching on block encrypted.

This commit is contained in:
Anton Hvornum 2021-03-29 08:56:41 +02:00
parent 6cba404b75
commit a156f224a8
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archinstall/lib/disk.py
View File

@ -142,7 +142,8 @@ class Partition():
self.target_mountpoint = mountpoint self.target_mountpoint = mountpoint
self.filesystem = filesystem self.filesystem = filesystem
self.size = size # TODO: Refresh? self.size = size # TODO: Refresh?
self._encrypted = encrypted self._encrypted = None
self.encrypted = encrypted
self.allow_formatting = False # A fail-safe for unconfigured partitions, such as windows NTFS partitions. self.allow_formatting = False # A fail-safe for unconfigured partitions, such as windows NTFS partitions.
if mountpoint: if mountpoint:
@ -161,7 +162,7 @@ class Partition():
self.filesystem = fstype self.filesystem = fstype
if self.filesystem == 'crypto_LUKS': if self.filesystem == 'crypto_LUKS':
self._encrypted = True self.encrypted = True
def __lt__(self, left_comparitor): def __lt__(self, left_comparitor):
if type(left_comparitor) == Partition: if type(left_comparitor) == Partition:

1
examples/guided.py
View File

@ -292,6 +292,7 @@ def perform_installation(device, boot_partition, language, mirrors):
Only requirement is that the block devices are Only requirement is that the block devices are
formatted and setup prior to entering this function. formatted and setup prior to entering this function.
""" """
print('Installing on:', device)
with archinstall.Installer(device, boot_partition=boot_partition, hostname=archinstall.arguments.get('hostname', 'Archinstall')) as installation: with archinstall.Installer(device, boot_partition=boot_partition, hostname=archinstall.arguments.get('hostname', 'Archinstall')) as installation:
## if len(mirrors): ## if len(mirrors):
# Certain services might be running that affects the system during installation. # Certain services might be running that affects the system during installation.