starlingx/meta-starlingx
Code Issues Proposed changes

stx-ha: fix the hardcoded binary path for sm

Browse Source 
- Fix the hardcoded binary path for sm macros
- Remove a useless commented line

Issus-ID: INF-30
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
This commit is contained in:
Jackie Huang 2020-04-24 15:57:12 +08:00 committed by Babak Sarashki
parent dee89cee22
commit 336f9475df
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
meta-stx-flock/stx-ha/files/0001-stx-ha-fix-hardcoded-path-for-sm.patch Normal file
View File

@ -0,0 +1,43 @@
From 652fda776827b527844bd61864a3b163d5f56a53 Mon Sep 17 00:00:00 2001
From: Babak Sarashki <Babak.SarAshki@windriver.com>
Date: Tue, 9 Jun 2020 11:18:24 -0700
Subject: [PATCH] stx-ha: fix hardcoded path for sm
From commit af44c87f in master branch.
---
service-mgmt/sm-common/src/sm_types.h | 4 ++--
service-mgmt/sm-common/src/sm_watchdog_nfs.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/service-mgmt/sm-common/src/sm_types.h b/service-mgmt/sm-common/src/sm_types.h
index b71d306..6d85d31 100644
--- a/service-mgmt/sm-common/src/sm_types.h
+++ b/service-mgmt/sm-common/src/sm_types.h
@@ -89,9 +89,9 @@ extern "C" {
#define SM_DUMP_DATA_FILE "/tmp/sm_data_dump.txt"
#define SM_TROUBLESHOOT_LOG_FILE "/var/log/sm-troubleshoot.log"
-#define SM_TROUBLESHOOT_SCRIPT "/usr/local/sbin/sm-troubleshoot"
+#define SM_TROUBLESHOOT_SCRIPT "/usr/sbin/sm-troubleshoot"
-#define SM_NOTIFICATION_SCRIPT "/usr/local/sbin/sm-notification"
+#define SM_NOTIFICATION_SCRIPT "/usr/sbin/sm-notification"
#define SM_SERVICE_DOMAIN_WEIGHT_MINIMUM 0
#define SM_SERVICE_DOMAIN_WEIGHT_UNSELECTABLE_ACTIVE -1
diff --git a/service-mgmt/sm-common/src/sm_watchdog_nfs.c b/service-mgmt/sm-common/src/sm_watchdog_nfs.c
index db08599..987d017 100644
--- a/service-mgmt/sm-common/src/sm_watchdog_nfs.c
+++ b/service-mgmt/sm-common/src/sm_watchdog_nfs.c
@@ -329,7 +329,7 @@ static void sm_watchdog_nfs_do_reboot( void )
open( "/dev/null", O_WRONLY ); // stderr
}
- execve( "/usr/local/sbin/collect", argv, env );
+ execve( "/usr/sbin/collect", argv, env );
// Shouldn't get this far, else there was an error.
exit(-1);
--
2.23.0

2
meta-stx-flock/stx-ha/libsm-common.bb
View File

@ -9,6 +9,8 @@ require ha-common.inc
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI += "file://0001-stx-ha-fix-hardcoded-path-for-sm.patch;striplevel=3"
DEPENDS_append = " \
glib-2.0 \
"