blob: ccf326a913da2ce59ae19b7b7e6886e2845bce14 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
From c1925ab965271875d4e9333be85cdfe8e1516948 Mon Sep 17 00:00:00 2001
From: Vernon Mauery <vernon.mauery@linux.intel.com>
Date: Fri, 14 Feb 2020 13:13:06 -0800
Subject: [PATCH] Fix 'Get System GUID' to use settings UUID
The upstream Get System GUID command looks first for a BMC interface
and then assumes that the UUID interface is next to that. But that is
not the case on Intel systems where the system GUID is found in the
settings daemon.
Change-Id: I924bd05e0a546f2b30288c1faf72157296ab6579
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
---
apphandler.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/apphandler.cpp b/apphandler.cpp
index dcfda11..780afbc 100644
--- a/apphandler.cpp
+++ b/apphandler.cpp
@@ -784,8 +784,6 @@ auto ipmiAppGetBtCapabilities()
auto ipmiAppGetSystemGuid() -> ipmi::RspType<std::array<uint8_t, 16>>
{
- static constexpr auto bmcInterface =
- "xyz.openbmc_project.Inventory.Item.Bmc";
static constexpr auto uuidInterface = "xyz.openbmc_project.Common.UUID";
static constexpr auto uuidProperty = "UUID";
@@ -794,7 +792,7 @@ auto ipmiAppGetSystemGuid() -> ipmi::RspType<std::array<uint8_t, 16>>
{
// Get the Inventory object implementing BMC interface
auto busPtr = getSdBus();
- auto objectInfo = ipmi::getDbusObject(*busPtr, bmcInterface);
+ auto objectInfo = ipmi::getDbusObject(*busPtr, uuidInterface);
// Read UUID property value from bmcObject
// UUID is in RFC4122 format Ex: 61a39523-78f2-11e5-9862-e6402cfc3223
--
2.17.1
|
