Reworked by rearranging agl-systemd's recipe

The current AGL is running the process as root user. Therefore,
there is no need to configure the capability. This patch changes
the script to not run the capability setting. I'm not sure if
these scripts are working as expected now. Toyota will not
implement the capability settings this time. This will be worked
out in future Production Readiness activities.

Signed-off-by: Riku Nomoto <riku_nomoto@mail.toyota.co.jp>
Change-Id: Ie425edd64441f7526f0774e75011b594802fbd4a

diff --git a/agl-systemd/99-agl.rules b/agl-systemd/99-basesystem.rules
similarity index 100%
rename from agl-systemd/99-agl.rules
rename to agl-systemd/99-basesystem.rules

diff --git a/agl-systemd/launch_sm.service b/agl-systemd/launch_sm.service
index 0a8d591..b1ada76 100755 (executable)
--- a/agl-systemd/launch_sm.service
+++ b/agl-systemd/launch_sm.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=launch_sm
-After=setup_refhw.service agl-trigger.service
- 
+
 [Service]
 PermissionsStartOnly=yes
 EnvironmentFile=/etc/basesystem/env.txt
@@ -17,6 +16,6 @@ LimitRSS=infinity
 LimitCORE=infinity
 LimitNOFILE=65536
 LimitMSGQUEUE=infinity
- 
+
 [Install]
 WantedBy=multi-user.target

diff --git a/agl-systemd/systemd-udev-trigger.service b/agl-systemd/systemd-udev-trigger.service
index e6431e7..c390f5b 100755 (executable)
--- a/agl-systemd/systemd-udev-trigger.service
+++ b/agl-systemd/systemd-udev-trigger.service
@@ -18,5 +18,4 @@ ConditionPathIsReadWrite=/sys
 Type=oneshot
 RemainAfterExit=yes
 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