From 117b6f48c0d4b626003bae1dafea16bd44dfe930 Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa 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 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 @@