rev

Author: h8d13

archinstoo/archinstall/lib/disk/device_handler.py

@@ -38,7 +38,6 @@
 )
 from archinstall.lib.models.users import Password
 from archinstall.lib.output import debug, error, info
-from archinstall.lib.utils.env import Os
 
 from .luks import Luks2
 from .utils import (
@@ -56,9 +55,6 @@ class DeviceHandler:
 	def __init__(self) -> None:
 		self._devices: dict[Path, BDevice] = {}
 		self._partition_table = PartitionTable.default()
-		if Os.get_env('ARCHINSTALL_SKIP_DEVICE_PROBE') == '1':
-			debug('Skipping device probe due to ARCHINSTALL_SKIP_DEVICE_PROBE=1')
-			return
 		self.load_devices()
 
 	@property

archinstoo/archinstall/lib/installer.py

@@ -21,7 +21,6 @@
 	DiskLayoutConfiguration,
 	EncryptionType,
 	FilesystemType,
-	LsblkInfo,
 	LvmVolume,
 	PartitionModification,
 	SectorSize,
@@ -992,23 +991,6 @@ def _get_luks_uuid_from_mapper_dev(self, mapper_dev_path: Path) -> str:
 
 		return lsblk_info.children[0].uuid
 
-	def _find_crypt_parent(self, dev_path: Path) -> LsblkInfo | None:
-		try:
-			lsblk_info = get_lsblk_info(dev_path, reverse=True, full_dev_path=True)
-		except DiskError as err:
-			debug(f'Unable to determine crypt parent for {dev_path}: {err}')
-			return None
-
-		def _walk(node: LsblkInfo) -> LsblkInfo | None:
-			if node.type == 'crypt':
-				return node
-			for child in node.children:
-				if found := _walk(child):
-					return found
-			return None
-
-		return _walk(lsblk_info)
-
 	def _get_kernel_params_partition(
 		self,
 		root_partition: PartitionModification,
@@ -1018,27 +1000,8 @@ def _get_kernel_params_partition(
 		kernel_parameters = []
 
 		if root_partition in self._disk_encryption.partitions:
-			crypt_parent = self._find_crypt_parent(root_partition.safe_dev_path)
-			if crypt_parent and crypt_parent.path != root_partition.safe_dev_path:
-				uuid = self._get_luks_uuid_from_mapper_dev(crypt_parent.path)
-				debug(f'Root partition is inside encrypted device, identifying by UUID: {uuid}')
-				kernel_parameters.append(f'cryptdevice=UUID={uuid}:{crypt_parent.name}')
-
-				if id_root:
-					if partuuid and root_partition.partuuid:
-						debug(
-							f'Identifying root partition inside LUKS by PARTUUID: {root_partition.partuuid}',
-						)
-						kernel_parameters.append(f'root=PARTUUID={root_partition.partuuid}')
-					elif root_partition.uuid:
-						debug(
-							f'Identifying root partition inside LUKS by UUID: {root_partition.uuid}',
-						)
-						kernel_parameters.append(f'root=UUID={root_partition.uuid}')
-					else:
-						raise ValueError('Root partition UUID could not be determined')
-
-				return kernel_parameters
+			# TODO: We need to detect if the encrypted device is a whole disk encryption,
+			# or simply a partition encryption. Right now we assume it's a partition (and we always have)
 
 			if partuuid:
 				debug(f'Root partition is an encrypted device, identifying by PARTUUID: {root_partition.partuuid}')
@@ -1498,8 +1461,7 @@ def _add_limine_bootloader(
 		hook_path.write_text(hook_contents)
 
 		kernel_params = ' '.join(self._get_kernel_params(root))
-		config_contents = '# Created by archinstall\n'
-		config_contents += 'timeout: 5\n'
+		config_contents = 'timeout: 5\n'
 
 		path_root = 'boot()'
 		if efi_partition and boot_partition != efi_partition: