From: Karel Zak <kzak@redhat.com>
Date: Fri, 2 Jul 2021 11:12:13 +0000 (+0200)
Subject: lscpu: don't use DMI if executed with --sysroot
X-Git-Tag: v2.37.1~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19dd7a1e302177900b0597359b5301ec833a1e9b;p=thirdparty%2Futil-linux.git

lscpu: don't use DMI if executed with --sysroot

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c
index 230eb5fddf..75dd17d614 100644
--- a/sys-utils/lscpu-arm.c
+++ b/sys-utils/lscpu-arm.c
@@ -364,7 +364,8 @@ static void arm_decode(struct lscpu_cxt *cxt, struct lscpu_cputype *ct)
 
 	arm_ids_decode(ct);
 	arm_rXpY_decode(ct);
-	if (cxt->is_cluster)
+
+	if (!cxt->noalive && cxt->is_cluster)
 		ct->nr_socket_on_cluster = get_number_of_physical_sockets_from_dmi();
 }
 
@@ -372,8 +373,9 @@ static int is_cluster_arm(struct lscpu_cxt *cxt)
 {
 	struct stat st;
 
-	if (!(strcmp(cxt->arch->name, "aarch64")) &&
-	     (stat(_PATH_ACPI_PPTT, &st) < 0) && (cxt->ncputypes == 1))
+	if (!cxt->noalive
+	    && strcmp(cxt->arch->name, "aarch64") == 0
+	    && stat(_PATH_ACPI_PPTT, &st) < 0 && cxt->ncputypes == 1)
 		return 1;
 	else
 		return 0;