Move luks into disk module (#4296)

Author: svartkanin

archinstall/lib/disk/device_handler.py

@@ -5,6 +5,7 @@
 from parted import Device, Disk, DiskException, FileSystem, Geometry, IOException, Partition, PartitionException, freshDisk, getAllDevices, getDevice, newDisk
 
 from archinstall.lib.command import SysCommand
+from archinstall.lib.disk.luks import Luks2, unlock_luks2_dev
 from archinstall.lib.disk.utils import (
 	find_lsblk_info,
 	get_all_lsblk_info,
@@ -14,7 +15,6 @@
 	umount,
 )
 from archinstall.lib.exceptions import DiskError, SysCallError, UnknownFilesystemFormat
-from archinstall.lib.luks import Luks2, unlock_luks2_dev
 from archinstall.lib.models.device import (
 	DEFAULT_ITER_TIME,
 	BDevice,
@@ -601,8 +601,8 @@ def partprobe(self, path: Path | None = None) -> None:
 	def _wipe(self, dev_path: Path) -> None:
 		"""
 		Wipe a device (partition or otherwise) of meta-data, be it file system, LVM, etc.
-		@param dev_path:    Device path of the partition to be wiped.
-		@type dev_path:     str
+		@param dev_path:	Device path of the partition to be wiped.
+		@type dev_path:		str
 		"""
 		with open(dev_path, 'wb') as p:
 			p.write(bytearray(1024))

archinstall/lib/disk/filesystem.py

@@ -3,6 +3,7 @@
 from pathlib import Path
 
 from archinstall.lib.disk.device_handler import device_handler
+from archinstall.lib.disk.luks import Luks2
 from archinstall.lib.disk.lvm import (
 	lvm_group_info,
 	lvm_pv_create,
@@ -12,7 +13,6 @@
 	lvm_vol_reduce,
 )
 from archinstall.lib.disk.utils import udev_sync
-from archinstall.lib.luks import Luks2
 from archinstall.lib.models.device import (
 	DiskEncryption,
 	DiskLayoutConfiguration,

archinstall/lib/luks.py archinstall/lib/disk/luks.pyarchinstall/lib/luks.py renamed to archinstall/lib/disk/luks.py

@@ -17,6 +17,7 @@
 from archinstall.lib.boot import Boot
 from archinstall.lib.command import SysCommand, run
 from archinstall.lib.disk.fido import Fido2
+from archinstall.lib.disk.luks import Luks2, unlock_luks2_dev
 from archinstall.lib.disk.lvm import lvm_import_vg, lvm_pvseg_info, lvm_vol_change
 from archinstall.lib.disk.utils import (
 	get_lsblk_by_mountpoint,
@@ -29,7 +30,6 @@
 from archinstall.lib.exceptions import DiskError, HardwareIncompatibilityError, RequirementError, ServiceException, SysCallError
 from archinstall.lib.hardware import SysInfo
 from archinstall.lib.locale.utils import verify_keyboard_layout, verify_x11_keyboard_layout
-from archinstall.lib.luks import Luks2, unlock_luks2_dev
 from archinstall.lib.mirror.mirror_handler import MirrorListHandler
 from archinstall.lib.models.application import ZramAlgorithm
 from archinstall.lib.models.bootloader import Bootloader