From 9dcb9b21032d3aa5c0d2ef016e4264af3ca0b90c Mon Sep 17 00:00:00 2001 From: Jan Heuermann Date: Tue, 9 May 2023 18:47:05 +0200 Subject: [PATCH] Remove workaround for legacy systemd versions --- tasks/provision_tc358743.yml | 8 -------- templates/load-tc358743-edid.systemd.j2 | 6 ------ 2 files changed, 14 deletions(-) diff --git a/tasks/provision_tc358743.yml b/tasks/provision_tc358743.yml index 53084e2..1f35f51 100644 --- a/tasks/provision_tc358743.yml +++ b/tasks/provision_tc358743.yml @@ -46,14 +46,6 @@ group: "{{ ustreamer_group }}" mode: '0644' -- name: get version of systemd - shell: systemctl --version | head -n 1 | grep --only-matching --perl-regexp '(?<=systemd )[0-9]+' - register: ustreamer_systemd_version_result - -- name: save systemd version - set_fact: - ustreamer_systemd_version: "{{ ustreamer_systemd_version_result.stdout }}" - - name: install TC358743 initializer service template: src: load-tc358743-edid.systemd.j2 diff --git a/templates/load-tc358743-edid.systemd.j2 b/templates/load-tc358743-edid.systemd.j2 index af913ea..7d7e2dd 100644 --- a/templates/load-tc358743-edid.systemd.j2 +++ b/templates/load-tc358743-edid.systemd.j2 @@ -6,13 +6,7 @@ StartLimitIntervalSec=300 StartLimitBurst=20 [Service] -{# Versions of systemd before 244 didn't support Restart for oneshot services - https://github.com/systemd/systemd/pull/13754 #} -{% if (ustreamer_systemd_version | int) >= 244 %} Type=oneshot -{% else %} -Type=simple -{% endif %} User=root ExecStart=v4l2-ctl \ --set-edid=file={{ ustreamer_edids_dir }}/tc358743-edid.hex \