From 96b0b0d6ac11323456912b3148b8d183ee9c627a Mon Sep 17 00:00:00 2001 From: Riku Nomoto Date: Wed, 30 Dec 2020 15:55:03 +0900 Subject: 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 Change-Id: Ie425edd64441f7526f0774e75011b594802fbd4a --- agl-systemd/99-agl.rules | 11 ----------- agl-systemd/99-basesystem.rules | 11 +++++++++++ agl-systemd/launch_sm.service | 5 ++--- agl-systemd/systemd-udev-trigger.service | 1 - 4 files changed, 13 insertions(+), 15 deletions(-) delete mode 100755 agl-systemd/99-agl.rules create mode 100755 agl-systemd/99-basesystem.rules diff --git a/agl-systemd/99-agl.rules b/agl-systemd/99-agl.rules deleted file mode 100755 index dd4e245..0000000 --- a/agl-systemd/99-agl.rules +++ /dev/null @@ -1,11 +0,0 @@ -#modify sound related device permissions - -SUBSYSTEM=="sound",MODE="0666" - -#modify dri related device permissions - -SUBSYSTEM=="drm",MODE="0777" - -#modify agl/evk related device permissions - -SUBSYSTEM=="evk",KERNEL=="agl/evk",MODE="0666" diff --git a/agl-systemd/99-basesystem.rules b/agl-systemd/99-basesystem.rules new file mode 100755 index 0000000..dd4e245 --- /dev/null +++ b/agl-systemd/99-basesystem.rules @@ -0,0 +1,11 @@ +#modify sound related device permissions + +SUBSYSTEM=="sound",MODE="0666" + +#modify dri related device permissions + +SUBSYSTEM=="drm",MODE="0777" + +#modify agl/evk related device permissions + +SUBSYSTEM=="evk",KERNEL=="agl/evk",MODE="0666" diff --git a/agl-systemd/launch_sm.service b/agl-systemd/launch_sm.service index 0a8d591..b1ada76 100755 --- 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 --- 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 -- cgit 1.2.3-korg