From 117b6f48c0d4b626003bae1dafea16bd44dfe930 Mon Sep 17 00:00:00 2001
From: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Date: Sun, 22 Nov 2020 02:27:41 +0000
Subject: Fix the path to user commands

Fix the path to the user commands, '/usr/agl/bin' to follow
the standard '/usr/bin'.

Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Change-Id: Ia10b428baf832b3db8f15a04605dc9c25ce14fe8
---
 .../system/system_manager/server/sm_launch__CWORD84_.xml | 16 ++++++++--------
 .../system_manager/server/src/ss_system_manager.cpp      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'service/system/system_manager/server')

diff --git a/service/system/system_manager/server/sm_launch__CWORD84_.xml b/service/system/system_manager/server/sm_launch__CWORD84_.xml
index 1392bbb..ab49871 100755
--- a/service/system/system_manager/server/sm_launch__CWORD84_.xml
+++ b/service/system/system_manager/server/sm_launch__CWORD84_.xml
@@ -1,14 +1,14 @@
 <!-- group_id=1 -->
 <group name="CoreModules" wait_time="0" trigger="False" >
   <launch 
-    name=MN_NS_NPPSERVICE path="/usr/agl/bin/NS_NPPService" priority=PR_NS_NPPSERVICE_S
+    name=MN_NS_NPPSERVICE path="/usr/bin/NS_NPPService" priority=PR_NS_NPPSERVICE_S
     critical="True" retry_cnt="0" arguments="-a SS_SysManager -r output=0x2"
     restart="NULL" is_start_required="False"
     shutdown_critical="True" shutdown_wait_time="20" fast_shutdown_wait_time="1000"
     user_name=""
   />
   <launch 
-    name=MN_NS_BACKUPMGR path="/usr/agl/bin/NS_BackupMgr" priority=PR_NS_BACKUPMGR_S
+    name=MN_NS_BACKUPMGR path="/usr/bin/NS_BackupMgr" priority=PR_NS_BACKUPMGR_S
     critical="True" retry_cnt="0" arguments="-l console"
     restart="NULL" is_start_required="True"
     shutdown_critical="True" shutdown_wait_time="15" fast_shutdown_wait_time="1000"
@@ -18,7 +18,7 @@
 <!-- group_id=2 -->
 <group name="SS_Logger" wait_time="0" trigger="False" >
   <launch 
-    name=MN_SS_LOGGERSRV path="/usr/agl/bin/SS_LoggerService" priority=PR_SS_LOGGERSRV_S
+    name=MN_SS_LOGGERSRV path="/usr/bin/SS_LoggerService" priority=PR_SS_LOGGERSRV_S
     critical="True" retry_cnt="0" arguments="-l console -p thrd=pdg.LogQueReader:30,thrd=pdg.TransmitQueReader:30,thrd=pdg.DumpQueReader:11,thrd=pdg.PerformanceQueReader:11,thrd=pdg.LogQueWriter:30,thrd=pdg.TransmitQueWriter:30,thrd=pdg.EvntLogQue:8,thrd=pdg.UdpQueWriter:10"
     restart="NULL" is_start_required="True"
     shutdown_critical="True" shutdown_wait_time="10" fast_shutdown_wait_time="1000"
@@ -35,7 +35,7 @@
    because the LOG save processing is performed by the GROUP2 termination processing of SS_LoggerService.
   -->
   <launch 
-    name=MN_COMMUNICATION path="/usr/agl/bin/communication" priority=PR_COMMUNICATION_S
+    name=MN_COMMUNICATION path="/usr/bin/communication" priority=PR_COMMUNICATION_S
     critical="True" retry_cnt="0" arguments="-l console"
     restart="NULL" is_start_required="True"
     shutdown_critical="False" shutdown_wait_time="20" fast_shutdown_wait_time="1000"
@@ -46,7 +46,7 @@
 <!-- group_id=4 -->
 <group name="VehicleModules" wait_time="0" trigger="False" >
   <launch
-    name=MN_POSITIONING path="/usr/agl/bin/Positioning" priority=PR_POSITIONING_S
+    name=MN_POSITIONING path="/usr/bin/Positioning" priority=PR_POSITIONING_S
     critical="True" retry_cnt="0" arguments="NULL"
     restart="NULL" is_start_required="True"
     shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
@@ -57,21 +57,21 @@
 <!-- group_id=5 -->
 <group name="SystemModules" wait_time="0" trigger="False" >
   <launch 
-    name=MN_SS_POWERSERVICE path="/usr/agl/bin/SS_PowerService" priority=PR_SS_POWERSERVICE_S
+    name=MN_SS_POWERSERVICE path="/usr/bin/SS_PowerService" priority=PR_SS_POWERSERVICE_S
     critical="True" retry_cnt="0" arguments="-l console"
     restart="NULL" is_start_required="True"
     shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
     user_name=""
   />
   <launch 
-    name=MN_SS_TASKMANAGER path="/usr/agl/bin/tskmgr" priority=PR_SS_TASKMANAGER_S
+    name=MN_SS_TASKMANAGER path="/usr/bin/tskmgr" priority=PR_SS_TASKMANAGER_S
     critical="True" retry_cnt="0" arguments="-l console"
     restart="NULL" is_start_required="True"
     shutdown_critical="True" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
     user_name=""
   />
   <launch 
-    name=MN_SS_RESOURCEMGR path="/usr/agl/bin/resm" priority=PR_SS_RESOURCEMGR_S
+    name=MN_SS_RESOURCEMGR path="/usr/bin/resm" priority=PR_SS_RESOURCEMGR_S
     critical="True" retry_cnt="0" arguments="-l console"
     restart="NULL" is_start_required="True"
     shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
diff --git a/service/system/system_manager/server/src/ss_system_manager.cpp b/service/system/system_manager/server/src/ss_system_manager.cpp
index 0b5d07a..c4b3c46 100755
--- a/service/system/system_manager/server/src/ss_system_manager.cpp
+++ b/service/system/system_manager/server/src/ss_system_manager.cpp
@@ -96,7 +96,7 @@ using namespace std;  // NOLINT
 static CSystemManager g_oSystemManger;
 
 #define SS_SM_TEMP_FILE_FOR_STORE_LOGS "/var/local/lib/basesystem/nv/BS/ss/system_manager/rwdata/sm_tempStoreLogs"
-#define TR_USB_PATH "/usr/agl/bin/realtimeUsbLog"
+#define TR_USB_PATH "/usr/bin/realtimeUsbLog"
 
 // \brief: public structure that is used for logging by NSLogger.
 FRAMEWORKUNIFIEDLOGPARAM g_FrameworkunifiedLogParams = {
-- 
cgit 1.2.3-korg