diff options
author | Scott Murray <scott.murray@konsulko.com> | 2020-08-19 18:37:51 -0400 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2020-08-19 18:37:51 -0400 |
commit | 5bdba822918cfffb69c0e1983661c32586bed590 (patch) | |
tree | b1fa11566e42190acc9b9cdda912a7cf2ed50ded /recipes-kernel/sllin/files | |
parent | 1677ce2027c49763ec186018f8cbf8fcec64c04f (diff) |
Add can-dev-mapping-helperjellyfish_9.99.3jellyfish/9.99.39.99.3
Changes:
- Add a can-dev-mapping-helper.sh script and systemd unit to drive
it, the script checks if the CAN devices specified in the low-can
configuration file /etc/dev-mapping.conf exist, and if not brings
up corresponding virtual CAN devices.
- Add a systemd over-ride conf file for agl-service-can-low-level
that makes can-dev-mapping-helper a dependency. This should ensure
that the low-can binding always starts even if there are no physical
CAN hardware devices.
- Added a Before statement to sllin-demo.service to ensure that it
will run before can-dev-mapping-helper and ensure that lin_config
can create sllin0 correctly.
- Removed the sllin-demo-virtual systemd unit, as it will no longer
be required with can-dev-mapping-helper.
- Updated the /var/run paths in sllin-demo.service and associated
start_lin_demo.sh script to quiet systemd warnings about /var/run
usage.
Bug-AGL: SPEC-3540
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ife02f75f57ac7bbdee6b02217e2ab657fe8c36e0
Diffstat (limited to 'recipes-kernel/sllin/files')
-rw-r--r-- | recipes-kernel/sllin/files/sllin-demo-virtual.service | 12 | ||||
-rw-r--r-- | recipes-kernel/sllin/files/sllin-demo.service | 3 | ||||
-rwxr-xr-x | recipes-kernel/sllin/files/start_lin_demo.sh | 3 |
3 files changed, 4 insertions, 14 deletions
diff --git a/recipes-kernel/sllin/files/sllin-demo-virtual.service b/recipes-kernel/sllin/files/sllin-demo-virtual.service deleted file mode 100644 index 788242197..000000000 --- a/recipes-kernel/sllin/files/sllin-demo-virtual.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=LIN demo configuration (virtual) -ConditionPathExists=!/dev/ttyUSB0 -After=afm-system-daemon.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/start_lin_demo.sh -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/recipes-kernel/sllin/files/sllin-demo.service b/recipes-kernel/sllin/files/sllin-demo.service index 2f2f5ac23..e3e7432f3 100644 --- a/recipes-kernel/sllin/files/sllin-demo.service +++ b/recipes-kernel/sllin/files/sllin-demo.service @@ -2,10 +2,11 @@ Description=LIN demo configuration ConditionPathExists=/dev/ttyUSB0 After=afm-system-daemon.service +Before=can-dev-mapping-helper.service [Service] Type=forking -PIDFile=/var/run/lin_config.pid +PIDFile=/run/lin_config/lin_config.pid ExecStart=/usr/bin/start_lin_demo.sh RemainAfterExit=yes diff --git a/recipes-kernel/sllin/files/start_lin_demo.sh b/recipes-kernel/sllin/files/start_lin_demo.sh index 26f64c0a1..c7627ca74 100755 --- a/recipes-kernel/sllin/files/start_lin_demo.sh +++ b/recipes-kernel/sllin/files/start_lin_demo.sh @@ -4,7 +4,8 @@ if [ -c /dev/ttyUSB0 ]; then sleep 1 /usr/bin/lin_config -c /etc/lin_config.conf -a sllin:/dev/ttyUSB0 - pidof lin_config > /var/run/lin_config.pid + mkdir -p /run/lin_config/ + pidof lin_config > /run/lin_config/lin_config.pid sleep 1 else ip link add dev sllin0 type vcan |