diff options
author | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2020-11-22 01:54:33 +0000 |
---|---|---|
committer | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2020-11-23 13:54:59 +0000 |
commit | 761d3a409fb8ddb3e01e1eded4aaab17bb4a155f (patch) | |
tree | 6797033ec08f907699824c2662a9bfd36f616be8 /agl-systemd | |
parent | 23d40b490b2e6735d70d413e6a147d78b1898c8b (diff) |
Fix path to various non-standard directories
Fix path to non-standard directories,
- /nv to /var/local/lib/basesystem/nv
- /ramd to /var/local/lib/basesystem/ramd
- /tool_9E_SI to /etc/basesystem
- /usr/target to /etc/basesystem/target
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Change-Id: I42a54624230cb0ec0271f8cdbacb0b178c9f3e8e
Diffstat (limited to 'agl-systemd')
-rwxr-xr-x | agl-systemd/agl-trigger.service | 4 | ||||
-rwxr-xr-x | agl-systemd/launch_sm.service | 6 | ||||
-rwxr-xr-x | agl-systemd/setup_refhw.service | 4 | ||||
-rwxr-xr-x | agl-systemd/systemd-udev-trigger.service | 4 | ||||
-rwxr-xr-x | agl-systemd/tool_9E_SI/agl_set_capability.sh | 4 | ||||
-rwxr-xr-x | agl-systemd/tool_9E_SI/launch_sm.sh | 2 | ||||
-rwxr-xr-x | agl-systemd/tool_9E_SI/set_capability.sh | 4 | ||||
-rwxr-xr-x | agl-systemd/tool_9E_SI/setup_refhw.sh | 12 |
8 files changed, 20 insertions, 20 deletions
diff --git a/agl-systemd/agl-trigger.service b/agl-systemd/agl-trigger.service index 8cb752f..ea4d528 100755 --- a/agl-systemd/agl-trigger.service +++ b/agl-systemd/agl-trigger.service @@ -11,8 +11,8 @@ [Service] Type=oneshot #RemainAfterExit=yes -EnvironmentFile=/tool_9E_SI/env.txt -ExecStart=/tool_9E_SI/agl_set_capability.sh +EnvironmentFile=/etc/basesystem/env.txt +ExecStart=/usr/bin/agl_set_capability.sh [Install] WantedBy=multi-user.target diff --git a/agl-systemd/launch_sm.service b/agl-systemd/launch_sm.service index 8edc914..0a8d591 100755 --- a/agl-systemd/launch_sm.service +++ b/agl-systemd/launch_sm.service @@ -4,9 +4,9 @@ After=setup_refhw.service agl-trigger.service [Service] PermissionsStartOnly=yes -EnvironmentFile=/tool_9E_SI/env.txt -ExecStartPre=/tool_9E_SI/set_cgroup_rt_runtime_us.sh 950000 -ExecStart=/tool_9E_SI/launch_sm.sh +EnvironmentFile=/etc/basesystem/env.txt +ExecStartPre=/usr/bin/set_cgroup_rt_runtime_us.sh 950000 +ExecStart=/usr/bin/launch_sm.sh Type=oneshot User=root StandardOutput=inherit diff --git a/agl-systemd/setup_refhw.service b/agl-systemd/setup_refhw.service index 427dfed..fe6b073 100755 --- a/agl-systemd/setup_refhw.service +++ b/agl-systemd/setup_refhw.service @@ -3,8 +3,8 @@ Description=Initialize Reference Hardware Settings #After=weston.service [Service] -EnvironmentFile=/tool_9E_SI/env.txt -ExecStart=/tool_9E_SI/setup_refhw.sh +EnvironmentFile=/etc/basesystem/env.txt +ExecStart=/usr/bin/setup_refhw.sh Type=oneshot #StandardInput=tty #TTYPath=/dev/tty1 diff --git a/agl-systemd/systemd-udev-trigger.service b/agl-systemd/systemd-udev-trigger.service index 07a3f30..e6431e7 100755 --- a/agl-systemd/systemd-udev-trigger.service +++ b/agl-systemd/systemd-udev-trigger.service @@ -17,6 +17,6 @@ ConditionPathIsReadWrite=/sys [Service] Type=oneshot RemainAfterExit=yes -EnvironmentFile=/tool_9E_SI/env.txt -ExecStartPre=/tool_9E_SI/set_capability.sh +EnvironmentFile=/etc/basesystem/env.txt +ExecStartPre=/usr/bin/set_capability.sh ExecStart=/bin/udevadm trigger --type=subsystems --action=add ; /bin/udevadm trigger --type=devices --action=add diff --git a/agl-systemd/tool_9E_SI/agl_set_capability.sh b/agl-systemd/tool_9E_SI/agl_set_capability.sh index 6b108ae..43c9dd2 100755 --- a/agl-systemd/tool_9E_SI/agl_set_capability.sh +++ b/agl-systemd/tool_9E_SI/agl_set_capability.sh @@ -16,7 +16,7 @@ # ROMFILESTOP=/ -CAP_LST=${ROMFILESTOP}/usr/target/agl_cap.lst +CAP_LST=${ROMFILESTOP}/etc/basesystem/target/agl_cap.lst echo `cat ${CAP_LST}` #----------------------------------------------------------------------- # Capability @@ -33,7 +33,7 @@ SKIPWARN=n #----------------------------------------------------------------------- # Set Capability for NFS or Set DummyLink for ROM #CAP_LST="/usr/debug/share/target/cap.lst" -CAP_LST="/usr/target/agl_cap.lst" +CAP_LST="/etc/basesystem/target/agl_cap.lst" if [ $IS_EMMC_BOOT -eq 0 ]; then if [ -f "${CAP_LST}" ];then diff --git a/agl-systemd/tool_9E_SI/launch_sm.sh b/agl-systemd/tool_9E_SI/launch_sm.sh index ed1e8d1..2fdec6f 100755 --- a/agl-systemd/tool_9E_SI/launch_sm.sh +++ b/agl-systemd/tool_9E_SI/launch_sm.sh @@ -20,7 +20,7 @@ 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/ -rm -rf /nv/romaccess +rm -rf /var/local/lib/basesystem/nv/romaccess rm /dev/shm/lockfile /usr/agl/bin/SS_SystemManager & diff --git a/agl-systemd/tool_9E_SI/set_capability.sh b/agl-systemd/tool_9E_SI/set_capability.sh index c16ab4a..3f8ab43 100755 --- a/agl-systemd/tool_9E_SI/set_capability.sh +++ b/agl-systemd/tool_9E_SI/set_capability.sh @@ -16,7 +16,7 @@ # ROMFILESTOP=/ -CAP_LST=${ROMFILESTOP}/usr/target/cap.lst +CAP_LST=${ROMFILESTOP}/etc/basesystem/target/cap.lst echo `cat ${CAP_LST}` #----------------------------------------------------------------------- # Capability @@ -33,7 +33,7 @@ SKIPWARN=n #----------------------------------------------------------------------- # Set Capability for NFS or Set DummyLink for ROM #CAP_LST="/usr/debug/share/target/cap.lst" -CAP_LST="/usr/target/cap.lst" +CAP_LST="/etc/basesystem/target/cap.lst" if [ $IS_EMMC_BOOT -eq 0 ]; then if [ -f "${CAP_LST}" ];then diff --git a/agl-systemd/tool_9E_SI/setup_refhw.sh b/agl-systemd/tool_9E_SI/setup_refhw.sh index 00abc93..9c20cb6 100755 --- a/agl-systemd/tool_9E_SI/setup_refhw.sh +++ b/agl-systemd/tool_9E_SI/setup_refhw.sh @@ -31,12 +31,12 @@ echo "AREA=$VEHICLEPARAMETERLIBRARY_AREA" >> /tmp/udev_device.env ## Sprint 29 To make WebService can update contents. #chown -R agl:agl /usr/agl/data/electronicom ## For btservice initial data. -#chown -R agl:agl /nv/backup/D_BK_CA_BT_MANAGEMENT +#chown -R agl:agl /var/local/lib/basesystem/nv/backup/D_BK_CA_BT_MANAGEMENT ## Sprint 29 PFDRECThread -mkdir -p /ramd/BS/ns/backup_manager/rwdata -mkdir -p /ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/diag -restorecon -R /ramd -#chmod 777 /ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/diag +mkdir -p /var/local/lib/basesystem/ramd/BS/ns/backup_manager/rwdata +mkdir -p /var/local/lib/basesystem/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/diag +restorecon -R /var/local/lib/basesystem/ramd +#chmod 777 /var/local/lib/basesystem/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/diag ## Sprint 29 communication #chmod -R 777 /home/root/.app_can_d # TODO:for bluetooth_service @@ -73,7 +73,7 @@ chmod 666 /dev/mqueue/IccSnd #chmod 777 /dev/mqueue/NS_NPPService #chmod 777 /run/user/0 -rm -rf /nv/romaccess +rm -rf /var/local/lib/basesystem/nv/romaccess rm /dev/shm/lockfile |