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: [PATCH] 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
---
 agl-systemd/env.txt                                |  2 +-
 agl-systemd/tool_9E_SI/launch_sm.sh                |  4 +-
 agl-systemd/usr/target/agl_cap.lst                 | 68 +++++++++++-----------
 .../system_manager_config/xml/sm_launch_agl.cfg    |  6 +-
 .../system_manager_config/xml/sm_launch_agl.xml    |  6 +-
 .../server/SS_LoggerService.conf_bin               |  2 +-
 .../server/include/ss_logger_scrshot.h             |  2 +-
 .../server/realtimeUsbLog/realtimeUsbLog.conf_bin  |  2 +-
 .../system/resource_manager/server/src/resm.cpp    |  4 +-
 .../system_manager/server/sm_launch__CWORD84_.xml  | 16 ++---
 .../server/src/ss_system_manager.cpp               |  2 +-
 .../client/libtskmcfg/conf/tskm_launch.xml         | 18 +++---
 12 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/agl-systemd/env.txt b/agl-systemd/env.txt
index d8ee4eb..15df506 100755
--- a/agl-systemd/env.txt
+++ b/agl-systemd/env.txt
@@ -9,7 +9,7 @@ INIT_GID="1000"
 AGL_RWDATA_PATH="/nv"
 LD_LIBRARY_PATH="/lib:/usr/lib:/usr/lib/basesystem:/usr/debug/lib"
 ARB_OPT="FORCE_REBOOT"
-PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/agl/bin:/usr/debug/bin:/usr/debug/sbin:/usr/debug/usr/bin:/usr/debug/usr/sbin"
+PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/bin:/usr/debug/bin:/usr/debug/sbin:/usr/debug/usr/bin:/usr/debug/usr/sbin"
 PWD="/dev/mqueue"
 OLDPWD="/dev/mqueue"
 SHLVL="1"
diff --git a/agl-systemd/tool_9E_SI/launch_sm.sh b/agl-systemd/tool_9E_SI/launch_sm.sh
index 2fdec6f..1fd4435 100755
--- a/agl-systemd/tool_9E_SI/launch_sm.sh
+++ b/agl-systemd/tool_9E_SI/launch_sm.sh
@@ -19,8 +19,8 @@
 export APPS_CONFIG_FILENAME=sm_launch.cfg
 export SM_CONFIG_DATA_FILENAME=gpf_ss_sm_config_data.cfg
 export XDG_RUNTIME_DIR=/run/user/0
-cd /usr/agl/bin/
+cd /usr/bin
 rm -rf /var/local/lib/basesystem/nv/romaccess
 rm /dev/shm/lockfile
 
-/usr/agl/bin/SS_SystemManager &
+/usr/bin/SS_SystemManager &
diff --git a/agl-systemd/usr/target/agl_cap.lst b/agl-systemd/usr/target/agl_cap.lst
index 89ea096..306f8b0 100755
--- a/agl-systemd/usr/target/agl_cap.lst
+++ b/agl-systemd/usr/target/agl_cap.lst
@@ -1,34 +1,34 @@
-/usr/agl/bin/SS_SystemManager|||cap_sys_nice,cap_setuid,cap_setgid,cap_sys_resource+ep|y
-/usr/agl/bin/tskmgr|||cap_sys_nice,cap_setuid,cap_setgid=ep|y
-/usr/agl/bin/SS_DeviceDetectionService|||cap_setuid,cap_setgid,cap_sys_resource,cap_dac_override,cap_sys_admin+ep|y
-/usr/agl/bin/communication|||cap_dac_override+ep|y
-/usr/agl/bin/AS_AudioManager|||cap_sys_nice+ep|y
-/usr/agl/bin/acmsrv|||cap_dac_override,cap_sys_admin,cap_sys_nice,cap_sys_resource,cap_chown,cap_fowner,cap_setgid,cap_setuid,cap_kill+ep|y
-/usr/agl/bin/PS_SwitchHandler|||cap_sys_admin,cap_dac_override+ep|y
-/usr/agl/bin/LockManager|||cap_kill+ep|y
-/usr/agl/bin/nandupdate|||cap_dac_override+ep|y
-/usr/agl/bin/wlan_controller|||cap_net_raw,cap_net_admin+ep|y
-/usr/agl/bin/DummyRead|||cap_dac_read_search+ep|y
-/usr/agl/bin/clock|||cap_sys_time+ep|y
-/usr/agl/bin/Mounter|||cap_sys_admin,cap_dac_override+ep|y
-/usr/agl/bin/MounterEx|||cap_sys_admin,cap_fowner,cap_dac_override,cap_chown+ep|y
-/usr/agl/bin/DevReproService|||cap_chown,cap_fowner,cap_dac_override+ep|y
-/usr/agl/bin/PS_CDR|||cap_sys_admin+ep|y
-/usr/agl/bin/webdavmgr|||cap_net_admin,cap_net_raw+ep|y
-/usr/agl/bin/DiagService|||cap_sys_rawio,cap_dac_override+ep|y
-/usr/agl/bin/resm|||cap_setuid+ep|y
-/usr/agl/bin/SS_LoggerService|||cap_dac_override+ep|y
-/usr/agl/bin/NetworkManager|||cap_setuid,cap_setgid,cap_sys_admin,cap_chown,cap_kill,cap_net_raw,cap_net_admin,cap_net_bind_service+ep|y
-/usr/agl/bin/RadioService|||cap_sys_nice+ep|y
-/usr/agl/bin/ASND_VProxy|||cap_sys_nice+ep|y
-/usr/agl/bin/misink|||cap_sys_nice+ep|y
-/usr/agl/bin/mlink|||cap_sys_nice+ep|y
-/usr/agl/bin/media_service|||cap_dac_override,cap_sys_nice+ep|y
-/usr/agl/bin/_CWORD74__service|||cap_dac_override+ep|y
-/usr/agl/bin/PlaybackService|||cap_sys_nice+ep|y
-/usr/agl/bin/Positioning|||cap_dac_override+ep|y
-/usr/agl/bin/vehicle|||cap_dac_override+ep|y
-/usr/agl/bin/bluetooth_srv|||cap_dac_override,cap_sys_nice+ep|y
-/usr/agl/bin/btd_srv|||cap_dac_override,cap_sys_nice+ep|y
-/usr/agl/bin/NS_BackupMgr|||cap_dac_override+ep|y
-/usr/agl/bin/Sound|||cap_dac_override+ep|y
+/usr/bin/SS_SystemManager|||cap_sys_nice,cap_setuid,cap_setgid,cap_sys_resource+ep|y
+/usr/bin/tskmgr|||cap_sys_nice,cap_setuid,cap_setgid=ep|y
+/usr/bin/SS_DeviceDetectionService|||cap_setuid,cap_setgid,cap_sys_resource,cap_dac_override,cap_sys_admin+ep|y
+/usr/bin/communication|||cap_dac_override+ep|y
+/usr/bin/AS_AudioManager|||cap_sys_nice+ep|y
+/usr/bin/acmsrv|||cap_dac_override,cap_sys_admin,cap_sys_nice,cap_sys_resource,cap_chown,cap_fowner,cap_setgid,cap_setuid,cap_kill+ep|y
+/usr/bin/PS_SwitchHandler|||cap_sys_admin,cap_dac_override+ep|y
+/usr/bin/LockManager|||cap_kill+ep|y
+/usr/bin/nandupdate|||cap_dac_override+ep|y
+/usr/bin/wlan_controller|||cap_net_raw,cap_net_admin+ep|y
+/usr/bin/DummyRead|||cap_dac_read_search+ep|y
+/usr/bin/clock|||cap_sys_time+ep|y
+/usr/bin/Mounter|||cap_sys_admin,cap_dac_override+ep|y
+/usr/bin/MounterEx|||cap_sys_admin,cap_fowner,cap_dac_override,cap_chown+ep|y
+/usr/bin/DevReproService|||cap_chown,cap_fowner,cap_dac_override+ep|y
+/usr/bin/PS_CDR|||cap_sys_admin+ep|y
+/usr/bin/webdavmgr|||cap_net_admin,cap_net_raw+ep|y
+/usr/bin/DiagService|||cap_sys_rawio,cap_dac_override+ep|y
+/usr/bin/resm|||cap_setuid+ep|y
+/usr/bin/SS_LoggerService|||cap_dac_override+ep|y
+/usr/bin/NetworkManager|||cap_setuid,cap_setgid,cap_sys_admin,cap_chown,cap_kill,cap_net_raw,cap_net_admin,cap_net_bind_service+ep|y
+/usr/bin/RadioService|||cap_sys_nice+ep|y
+/usr/bin/ASND_VProxy|||cap_sys_nice+ep|y
+/usr/bin/misink|||cap_sys_nice+ep|y
+/usr/bin/mlink|||cap_sys_nice+ep|y
+/usr/bin/media_service|||cap_dac_override,cap_sys_nice+ep|y
+/usr/bin/_CWORD74__service|||cap_dac_override+ep|y
+/usr/bin/PlaybackService|||cap_sys_nice+ep|y
+/usr/bin/Positioning|||cap_dac_override+ep|y
+/usr/bin/vehicle|||cap_dac_override+ep|y
+/usr/bin/bluetooth_srv|||cap_dac_override,cap_sys_nice+ep|y
+/usr/bin/btd_srv|||cap_dac_override,cap_sys_nice+ep|y
+/usr/bin/NS_BackupMgr|||cap_dac_override+ep|y
+/usr/bin/Sound|||cap_dac_override+ep|y
diff --git a/service/system/config/library/system_manager_config/xml/sm_launch_agl.cfg b/service/system/config/library/system_manager_config/xml/sm_launch_agl.cfg
index 876ab41..e1c544a 100755
--- a/service/system/config/library/system_manager_config/xml/sm_launch_agl.cfg
+++ b/service/system/config/library/system_manager_config/xml/sm_launch_agl.cfg
@@ -1,7 +1,7 @@
 #  This file is created from sm_launch_agl.xml.tmp.
 #  created date : Tue Aug 29 13:31:32 JST 2017
 [ModulesLaunchConfig]
-Launch1=CoreModules|1|0|False|NS_NPPService|/usr/agl/bin/NS_NPPService|25|True|0|-a SS_SysManager -r output=0x2|NULL|NULL|False|True|20|1000||
-Launch2=CoreModules|1|0|False|NS_BackupMgr|/usr/agl/bin/NS_BackupMgr|25|True|0|-l console|NULL|NULL|True|True|15|1000||
+Launch1=CoreModules|1|0|False|NS_NPPService|/usr/bin/NS_NPPService|25|True|0|-a SS_SysManager -r output=0x2|NULL|NULL|False|True|20|1000||
+Launch2=CoreModules|1|0|False|NS_BackupMgr|/usr/bin/NS_BackupMgr|25|True|0|-l console|NULL|NULL|True|True|15|1000||
 Launch3=SS_Logger|2|0|False|SS_DevDetectSrv|/tmp/SS_DeviceDetectionService|20|True|0|-l console|NULL|NULL|True|False|1|1000||
-Launch4=SS_Logger|2|0|False|SS_LoggerSrv|/usr/agl/bin/SS_LoggerService|0|True|0|-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|NULL|NULL|True|True|10|1000||
+Launch4=SS_Logger|2|0|False|SS_LoggerSrv|/usr/bin/SS_LoggerService|0|True|0|-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|NULL|NULL|True|True|10|1000||
diff --git a/service/system/config/library/system_manager_config/xml/sm_launch_agl.xml b/service/system/config/library/system_manager_config/xml/sm_launch_agl.xml
index a433be3..6560832 100755
--- a/service/system/config/library/system_manager_config/xml/sm_launch_agl.xml
+++ b/service/system/config/library/system_manager_config/xml/sm_launch_agl.xml
@@ -1,14 +1,14 @@
 <!-- group_id=1 -->
 <group name="CoreModules" wait_time="0" trigger="False" >
   <launch 
-    name="NS_NPPService" path="/usr/agl/bin/NS_NPPService" priority="25"
+    name="NS_NPPService" path="/usr/bin/NS_NPPService" priority="25"
     critical="True" retry_cnt="0" arguments="-a SS_SysManager -r output=0x2"
     logging_mask="NULL" restart="NULL" is_start_required="False"
     shutdown_critical="True" shutdown_wait_time="20" fast_shutdown_wait_time="1000"
     user_name=""
   />
   <launch 
-    name="NS_BackupMgr" path="/usr/agl/bin/NS_BackupMgr" priority="25"
+    name="NS_BackupMgr" path="/usr/bin/NS_BackupMgr" priority="25"
     critical="True" retry_cnt="0" arguments="-l console"
     logging_mask="NULL" restart="NULL" is_start_required="True"
     shutdown_critical="True" shutdown_wait_time="15" fast_shutdown_wait_time="1000"
@@ -25,7 +25,7 @@
     user_name=""
   />
   <launch 
-    name="SS_LoggerSrv" path="/usr/agl/bin/SS_LoggerService" priority="0"
+    name="SS_LoggerSrv" path="/usr/bin/SS_LoggerService" priority="0"
     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"
     logging_mask="NULL" restart="NULL" is_start_required="True"
     shutdown_critical="True" shutdown_wait_time="10" fast_shutdown_wait_time="1000"
diff --git a/service/system/logger_service/server/SS_LoggerService.conf_bin b/service/system/logger_service/server/SS_LoggerService.conf_bin
index 440d361..0fe3783 100755
--- a/service/system/logger_service/server/SS_LoggerService.conf_bin
+++ b/service/system/logger_service/server/SS_LoggerService.conf_bin
@@ -1,4 +1,4 @@
-/usr/agl/bin|${OSW_reldbg}
+/usr/bin|${OSW_reldbg}
 debug|dbg
 release|rel
 product|rel
diff --git a/service/system/logger_service/server/include/ss_logger_scrshot.h b/service/system/logger_service/server/include/ss_logger_scrshot.h
index 4ac1fb6..8b37901 100755
--- a/service/system/logger_service/server/include/ss_logger_scrshot.h
+++ b/service/system/logger_service/server/include/ss_logger_scrshot.h
@@ -24,7 +24,7 @@
 
 #define JPEG_PATH_CH0     "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch0.jpeg"
 #define JPEG_PATH_CH1     "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch1.jpeg"
-#define SCRSHOT_EXE_PATH  "/usr/agl/bin/SS_ScrShot"
+#define SCRSHOT_EXE_PATH  "/usr/bin/SS_ScrShot"
 #define SCREEN_SHOT_PATH  "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/screenShot"
 
 #endif  // LOGGER_SERVICE_SERVER_INCLUDE_SS_LOGGER_SCRSHOT_H_
diff --git a/service/system/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin b/service/system/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin
index 440d361..0fe3783 100755
--- a/service/system/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin
+++ b/service/system/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin
@@ -1,4 +1,4 @@
-/usr/agl/bin|${OSW_reldbg}
+/usr/bin|${OSW_reldbg}
 debug|dbg
 release|rel
 product|rel
diff --git a/service/system/resource_manager/server/src/resm.cpp b/service/system/resource_manager/server/src/resm.cpp
index 41caa19..6bed6bd 100755
--- a/service/system/resource_manager/server/src/resm.cpp
+++ b/service/system/resource_manager/server/src/resm.cpp
@@ -90,9 +90,9 @@ CFrameworkunifiedVersion g_FrameworkunifiedVersion(MAJORNO, MINORNO, REVISION);
 #define DEBUG_INFO_CPU_TOP_LINES  (10)
 #define DEBUG_INFO_CMA_MIN  (160000)  // in KB
 #define DEBUG_INFO_CMA_LETTERS  (20)
-#define DEBUG_INFO_DSP_PG_PATH  "/usr/agl/bin/bs_analysis_dispinfo_debug"
+#define DEBUG_INFO_DSP_PG_PATH  "/usr/bin/bs_analysis_dispinfo_debug"
 
-#define DROP_CACHES_PG_PATH "/usr/agl/bin/drop_caches"
+#define DROP_CACHES_PG_PATH "/usr/bin/drop_caches"
 
 #define READLINE_MAX_SIZE       512
 #define READ_MAX_SIZE          4096
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 = {
diff --git a/service/system/task_manager/client/libtskmcfg/conf/tskm_launch.xml b/service/system/task_manager/client/libtskmcfg/conf/tskm_launch.xml
index d4ab06c..a7d7273 100755
--- a/service/system/task_manager/client/libtskmcfg/conf/tskm_launch.xml
+++ b/service/system/task_manager/client/libtskmcfg/conf/tskm_launch.xml
@@ -2,7 +2,7 @@
   <service 
     svcid="TSKM_SVCID_ACTIVITYMGR"
     name=MN_ACTIVITYMANAGER
-    path="/usr/agl/bin/acmsrv"
+    path="/usr/bin/acmsrv"
     prio=PR_ACTIVITYMANAGER_S
     policy="tss"
     life_cycle="always"
@@ -12,7 +12,7 @@
   <service 
     svcid="TSKM_SVCID_TE_RESIDENT"
     name=MN_RESIDENT_SVC
-    path="/usr/agl/bin/resident"
+    path="/usr/bin/resident"
     prio=PR_RESIDENT_SVC_S
     policy="tss"
     life_cycle="always"
@@ -22,7 +22,7 @@
   <service 
     svcid="TSKM_SVCID_TE_TRANSIENT"
     name =MN_TRANSIENT_SVC
-    path="/usr/agl/bin/transient"
+    path="/usr/bin/transient"
     prio=PR_TRANSIENT_SVC_S
     policy="tss"
     user=""
@@ -32,7 +32,7 @@
   <service 
     svcid="TSKM_SVCID__CWORD58_"
     name =MN__CWORD58_SERVICE
-    path="/usr/agl/bin/_CWORD58_Service"
+    path="/usr/bin/_CWORD58_Service"
     prio=PR__CWORD58_SERVICE_S
     policy="tss"
     retry_cnt="-1"
@@ -60,7 +60,7 @@
   <service 
     svcid="TSKM_SVCID_XMVUPSRV"
     name =MN_XMVUPSERVICE
-    path="/usr/agl/bin/radio_xm_update"
+    path="/usr/bin/radio_xm_update"
     prio=PR_XMVUPSERVICE_S
     policy="tss"
     user=""
@@ -69,7 +69,7 @@
   <service 
     svcid="TSKM_SVCID_BTPHONESRV"
     name =MN_BTPHONESRV
-    path="/usr/agl/bin/BT_PhoneSrv"
+    path="/usr/bin/BT_PhoneSrv"
     prio=PR_BTPHONESRV_S
     policy="tss"
     user=""
@@ -78,7 +78,7 @@
   <service 
     svcid="TSKM_SVCID_BTPBKSRV"
     name =MN_BTPBKSRV
-    path="/usr/agl/bin/BT_PbkSrv"
+    path="/usr/bin/BT_PbkSrv"
     prio=PR_BTPBKSRV_S
     policy="tss"
     user=""
@@ -87,7 +87,7 @@
   <service 
     svcid="TSKM_SVCID_BTMSGSRV"
     name =MN_BTMSGSRV
-    path="/usr/agl/bin/BT_MsgSrv"
+    path="/usr/bin/BT_MsgSrv"
     prio=PR_BTMSGSRV_S
     policy="tss"
     user=""
@@ -96,7 +96,7 @@
   <service 
     svcid="TSKM_SVCID_DTVVUPSRV"
     name =MN_DTVVUPSERVICE
-    path="/usr/agl/bin/DtvVupService"
+    path="/usr/bin/DtvVupService"
     prio=PR_DTVVUPSERVICE_S
     policy="tss"
     user=""
-- 
2.16.6