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