From 214fd1928249487550c9432762e205ccc9b41b97 Mon Sep 17 00:00:00 2001 From: Arjun Date: Tue, 27 May 2025 20:35:19 +0530 Subject: [PATCH 1/4] Added support for ipmitool --- script/get-generic-sys-util/meta.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/script/get-generic-sys-util/meta.yaml b/script/get-generic-sys-util/meta.yaml index eac6ecdb1..eb530868c 100644 --- a/script/get-generic-sys-util/meta.yaml +++ b/script/get-generic-sys-util/meta.yaml @@ -139,6 +139,20 @@ variations: dnf: '' yum: '' + ipmitool: + env: + MLC_SYS_UTIL_NAME: ipmitool + MLC_SYS_UTIL_VERSION_CMD: ipmitool -V + MLC_TMP_VERSION_DETECT_GROUP_NUMBER: 0 + new_env_keys: + - MLC_IPMITOOL_VERSION + state: + ipmitool: # tbd: complete for other flavours of linux + apt: ipmitool + brew: '' + dnf: '' + yum: '' + libgl: env: MLC_SYS_UTIL_NAME: libgl # tbd: regular expression for version as well as whether its installed? From 32268a21744c998a36688e6eaa9096f56c3364a9 Mon Sep 17 00:00:00 2001 From: Arjun Date: Wed, 28 May 2025 13:46:29 +0530 Subject: [PATCH 2/4] Fix ipmitool version detect --- script/get-generic-sys-util/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/script/get-generic-sys-util/meta.yaml b/script/get-generic-sys-util/meta.yaml index eb530868c..c827b4b72 100644 --- a/script/get-generic-sys-util/meta.yaml +++ b/script/get-generic-sys-util/meta.yaml @@ -143,6 +143,7 @@ variations: env: MLC_SYS_UTIL_NAME: ipmitool MLC_SYS_UTIL_VERSION_CMD: ipmitool -V + MLC_SYS_UTIL_VERSION_RE: 'ipmitool version ([\d.]+)' MLC_TMP_VERSION_DETECT_GROUP_NUMBER: 0 new_env_keys: - MLC_IPMITOOL_VERSION From 7fcd7a1e1b707f171c644a9e57aa8c233b6b9a94 Mon Sep 17 00:00:00 2001 From: Arjun Date: Wed, 28 May 2025 20:21:33 +0530 Subject: [PATCH 3/4] Fix detect-sudo --- script/detect-sudo/customize.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/script/detect-sudo/customize.py b/script/detect-sudo/customize.py index 2a56f6d33..5b69a6fdb 100644 --- a/script/detect-sudo/customize.py +++ b/script/detect-sudo/customize.py @@ -129,8 +129,7 @@ def get_input(): def prompt_sudo(logger): - if os.geteuid() != 0 and not is_user_in_sudo_group( - logger): # No sudo required for root user + if os.geteuid() != 0: # No sudo required for root user # Prompt for the password @@ -171,7 +170,7 @@ def prompt_sudo(logger): except subprocess.TimeoutExpired: logger.info("Timedout") reset_terminal() # Reset terminal to sane state - if not prompt_retry(): # If the user chooses not to retry or times out + if not prompt_retry(logger): # If the user chooses not to retry or times out return -1 except subprocess.CalledProcessError as e: logger.error(f"Command failed: {e.output}") From 12dd156f1027abaf9c3bdcfd106948e9a04bc004 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 28 May 2025 14:52:23 +0000 Subject: [PATCH 4/4] [Automated Commit] Format Codebase [skip ci] --- script/detect-sudo/customize.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/detect-sudo/customize.py b/script/detect-sudo/customize.py index 5b69a6fdb..3e1b65059 100644 --- a/script/detect-sudo/customize.py +++ b/script/detect-sudo/customize.py @@ -170,7 +170,8 @@ def prompt_sudo(logger): except subprocess.TimeoutExpired: logger.info("Timedout") reset_terminal() # Reset terminal to sane state - if not prompt_retry(logger): # If the user chooses not to retry or times out + if not prompt_retry( + logger): # If the user chooses not to retry or times out return -1 except subprocess.CalledProcessError as e: logger.error(f"Command failed: {e.output}")