From a633fc5d27dbc742aa3904355394128a0e2ef137 Mon Sep 17 00:00:00 2001 From: codefiles <11915375+codefiles@users.noreply.github.com> Date: Wed, 22 Jul 2026 04:25:55 -0400 Subject: [PATCH] Use run for lsblk command (#4654) --- archinstall/lib/disk/utils.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/archinstall/lib/disk/utils.py b/archinstall/lib/disk/utils.py index 900445e1..5829164a 100644 --- a/archinstall/lib/disk/utils.py +++ b/archinstall/lib/disk/utils.py @@ -1,8 +1,9 @@ from pathlib import Path +from subprocess import CalledProcessError from pydantic import BaseModel -from archinstall.lib.command import SysCommand +from archinstall.lib.command import SysCommand, run from archinstall.lib.exceptions import DiskError, SysCallError from archinstall.lib.log import debug, info, warn from archinstall.lib.models.device import LsblkInfo @@ -29,19 +30,18 @@ def _fetch_lsblk_info( cmd.append(str(dev_path)) try: - worker = SysCommand(cmd) - except SysCallError as err: + result = run(cmd) + except CalledProcessError as err: # Get the output minus the message/info from lsblk if it returns a non-zero exit code. - if err.worker_log: - debug(f'Error calling lsblk: {err.worker_log.decode()}') + if stdout := err.stdout: + debug(f'Error calling lsblk: {stdout.decode().rstrip()}') if dev_path: raise DiskError(f'Failed to read disk "{dev_path}" with lsblk') raise err - output = worker.output(remove_cr=False) - return LsblkOutput.model_validate_json(output) + return LsblkOutput.model_validate_json(result.stdout) def get_lsblk_info(