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

Move get_parent_device_path() to disk.utils (#4243)

This commit is contained in:
codefiles 2026-02-17 17:12:47 -05:00 committed by GitHub
parent f736b8c4ec
commit f2c17c6341
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall/lib/disk/device_handler.py
View File

@ -187,10 +187,6 @@ class DeviceHandler:
return part return part
return None return None
def get_parent_device_path(self, dev_path: Path) -> Path:
lsblk = get_lsblk_info(dev_path)
return Path(f'/dev/{lsblk.pkname}')
def get_uuid_for_path(self, path: Path) -> str | None: def get_uuid_for_path(self, path: Path) -> str | None:
partition = self.find_partition(path) partition = self.find_partition(path)
return partition.partuuid if partition else None return partition.partuuid if partition else None

5
archinstall/lib/disk/utils.py
View File

@ -110,6 +110,11 @@ def disk_layouts() -> str:
return lsblk_output.model_dump_json(indent=4) return lsblk_output.model_dump_json(indent=4)
def get_parent_device_path(dev_path: Path) -> Path:
lsblk = get_lsblk_info(dev_path)
return Path(f'/dev/{lsblk.pkname}')
def get_unique_path_for_device(dev_path: Path) -> Path | None: def get_unique_path_for_device(dev_path: Path) -> Path | None:
paths = Path('/dev/disk/by-id').glob('*') paths = Path('/dev/disk/by-id').glob('*')
linked_targets = {p.resolve(): p for p in paths} linked_targets = {p.resolve(): p for p in paths}

9
archinstall/lib/installer.py
View File

@ -19,6 +19,7 @@ from archinstall.lib.disk.fido import Fido2
from archinstall.lib.disk.utils import ( from archinstall.lib.disk.utils import (
get_lsblk_by_mountpoint, get_lsblk_by_mountpoint,
get_lsblk_info, get_lsblk_info,
get_parent_device_path,
get_unique_path_for_device, get_unique_path_for_device,
mount, mount,
swapon, swapon,
@ -1381,7 +1382,7 @@ class Installer:
else: else:
info(f'GRUB boot partition: {boot_partition.dev_path}') info(f'GRUB boot partition: {boot_partition.dev_path}')
parent_dev_path = device_handler.get_parent_device_path(boot_partition.safe_dev_path) parent_dev_path = get_parent_device_path(boot_partition.safe_dev_path)
add_options = [ add_options = [
'--target=i386-pc', '--target=i386-pc',
@ -1475,7 +1476,7 @@ class Installer:
info(f'Limine EFI partition: {efi_partition.dev_path}') info(f'Limine EFI partition: {efi_partition.dev_path}')
parent_dev_path = device_handler.get_parent_device_path(efi_partition.safe_dev_path) parent_dev_path = get_parent_device_path(efi_partition.safe_dev_path)
try: try:
efi_dir_path = self.target / efi_partition.mountpoint.relative_to('/') / 'EFI' efi_dir_path = self.target / efi_partition.mountpoint.relative_to('/') / 'EFI'
@ -1538,7 +1539,7 @@ class Installer:
config_path = boot_limine_path / 'limine.conf' config_path = boot_limine_path / 'limine.conf'
parent_dev_path = device_handler.get_parent_device_path(boot_partition.safe_dev_path) parent_dev_path = get_parent_device_path(boot_partition.safe_dev_path)
if unique_path := get_unique_path_for_device(parent_dev_path): if unique_path := get_unique_path_for_device(parent_dev_path):
parent_dev_path = unique_path parent_dev_path = unique_path
@ -1635,7 +1636,7 @@ class Installer:
loader = '/EFI/Linux/arch-{kernel}.efi' loader = '/EFI/Linux/arch-{kernel}.efi'
cmdline = [] cmdline = []
parent_dev_path = device_handler.get_parent_device_path(boot_partition.safe_dev_path) parent_dev_path = get_parent_device_path(boot_partition.safe_dev_path)
cmd_template = ( cmd_template = (
'efibootmgr', 'efibootmgr',