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

Adding debug information

This commit is contained in:
Anton Hvornum 2022-12-22 13:19:02 +01:00
parent d3ca700244
commit 30880d7747
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archinstall/lib/disk/helpers.py
View File

@ -230,15 +230,20 @@ def get_blockdevice_info(device_path, exclude_iso_dev :bool = True) -> Dict[str,
except SysCallError as ex: except SysCallError as ex:
if ex.exit_code in (512, 2): if ex.exit_code in (512, 2):
# Assume that it's a loop device, and try to get info on it # Assume that it's a loop device, and try to get info on it
try:
resolved_device_name = device_path.readlink().name
except OSError:
resolved_device_name = device_path.name
try: try:
information = get_loop_info(device_path) information = get_loop_info(device_path)
if not information: if not information:
print("Exit code for blkid -p -o export was:", ex.exit_code) print("Exit code for blkid -p -o export was:", ex.exit_code)
raise SysCallError(f"Could not get loop information for {device_path.readlink().name}", exit_code=1) raise SysCallError(f"Could not get loop information for {resolved_device_name}", exit_code=1)
except SysCallError: except SysCallError:
print(f"Not a loop device, trying uevent rules for {device_path.readlink().name}") print(f"Not a loop device, trying uevent rules for {resolved_device_name}")
information = get_blockdevice_uevent(device_path.readlink().name) information = get_blockdevice_uevent(resolved_device_name)
return enrich_blockdevice_information(information) return enrich_blockdevice_information(information)
else: else:
# We could not reliably get any information, perhaps the disk is clean of information? # We could not reliably get any information, perhaps the disk is clean of information?