From 474183ab71aadd5b150b5d0a8acf0eae56e43ee2 Mon Sep 17 00:00:00 2001 From: Alejandro Sirgo Rica Date: Mon, 1 Apr 2024 12:28:46 +0200 Subject: utils: fix mount error messages for os probe operations Replace unexistent mountpoint variable to report a failed mount operation before an OS probe from a partition. Improve the semantics of the error message replacing 'at' with 'into'. Remove the period at the end of the log message. --- src/utils/boot.py | 2 +- src/utils/uefi.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/boot.py b/src/utils/boot.py index 1dcc655..9ce5238 100644 --- a/src/utils/boot.py +++ b/src/utils/boot.py @@ -109,7 +109,7 @@ def boot_os_at(disk, part): device = get_partition_device(disk, part) mountpoint = device.replace('dev', 'mnt') if not mount_mkdir(device, mountpoint): - raise RuntimeError(f'Cannot probe OS family. Unable to mount {device} at {esp_mountpoint}.') + raise RuntimeError(f'Cannot probe OS family. Unable to mount {device} into {mountpoint}') is_uefi = is_uefi_supported() if is_uefi: diff --git a/src/utils/uefi.py b/src/utils/uefi.py index 5561a6a..b51d765 100644 --- a/src/utils/uefi.py +++ b/src/utils/uefi.py @@ -106,7 +106,7 @@ def copy_windows_efi_bootloader(disk, partition): device = get_partition_device(disk, partition) mountpoint = device.replace('dev', 'mnt') if not mount_mkdir(device, mountpoint): - raise RuntimeError(f'Cannot probe OS family. Unable to mount {device} at {esp_mountpoint}') + raise RuntimeError(f'Cannot probe OS family. Unable to mount {device} into {mountpoint}') os_family = get_os_family(mountpoint) is_uefi = is_uefi_supported() -- cgit v1.2.3-18-g5258