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

Fixing UUID on encrypted partitions.

This commit is contained in:
Anton Hvornum 2021-04-10 00:06:25 +02:00
parent 103320b061
commit e7ad4038bd
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archinstall/lib/installer.py
View File

@ -256,6 +256,9 @@ class Installer():
return True return True
def detect_encryption(self, partition):
return partition.encrypted or (partition.parent not in partition.path and Partition(partition.parent, None, autodetect_filesystem=True).filesystem == 'crypto_LUKS')
def minimal_installation(self): def minimal_installation(self):
## Add necessary packages if encrypting the drive ## Add necessary packages if encrypting the drive
## (encrypted partitions default to btrfs for now, so we need btrfs-progs) ## (encrypted partitions default to btrfs for now, so we need btrfs-progs)
@ -282,7 +285,7 @@ class Installer():
if '/usr/bin/btrfs-progs' not in BINARIES: if '/usr/bin/btrfs-progs' not in BINARIES:
BINARIES.append('/usr/bin/btrfs') BINARIES.append('/usr/bin/btrfs')
if (partition.encrypted or (partition.parent not in partition.path and Partition(partition.parent, None, autodetect_filesystem=True).filesystem == 'crypto_LUKS')): if self.detect_encryption(partition):
if 'encrypt' not in HOOKS: if 'encrypt' not in HOOKS:
HOOKS.insert(HOOKS.index('filesystems'), 'encrypt') HOOKS.insert(HOOKS.index('filesystems'), 'encrypt')
@ -372,7 +375,7 @@ class Installer():
## so we'll use the old manual method until we get that sorted out. ## so we'll use the old manual method until we get that sorted out.
if root_partition.encrypted: if self.detect_encryption(root_partition):
log(f"Identifying root partition by DISK-UUID on {root_partition}, looking for '{os.path.basename(root_partition.real_device)}'.", level=LOG_LEVELS.Debug) log(f"Identifying root partition by DISK-UUID on {root_partition}, looking for '{os.path.basename(root_partition.real_device)}'.", level=LOG_LEVELS.Debug)
for root, folders, uids in os.walk('/dev/disk/by-uuid'): for root, folders, uids in os.walk('/dev/disk/by-uuid'):
for uid in uids: for uid in uids: