Skip to content

Commit 3e89c6e

Browse files
committed
remove legacy install_marker check
1 parent 1f86b47 commit 3e89c6e

File tree

2 files changed

+0
-19
lines changed

2 files changed

+0
-19
lines changed

tc2/rtl8821au/init.sls

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{% from "tc2/rtl8821au/map.jinja" import rtl8821au with context %}
22
{% set device_present = salt['cacophony.has_usb_device'](rtl8821au['device_ids']) %}
3-
{% set install_marker = rtl8821au['install_marker'] %}
43
{% set driver_installed = salt['cmd.retcode'](['modinfo', '8821au']) == 0 %}
54
{% set should_install = rtl8821au['auto_update'] or not driver_installed %}
65
{% set install_command = "./install-driver.sh" %}
@@ -38,9 +37,6 @@ rtl8821au-source:
3837
- pkg: rtl8821au-deps
3938
{% endif %}
4039
- user: root
41-
{% if not rtl8821au['auto_update'] %}
42-
- unless: test -f "{{ install_marker }}"
43-
{% endif %}
4440
4541
rtl8821au-install:
4642
cmd.run:
@@ -82,19 +78,6 @@ rtl8821au-enable-tc2-hat-attiny:
8278
- cmd: rtl8821au-reinstall
8379
- service: rtl8821au-disable-tc2-hat-attiny
8480
85-
rtl8821au-marker:
86-
file.managed:
87-
- name: {{ install_marker }}
88-
- contents: installed
89-
- makedirs: True
90-
- onlyif: modinfo 8821au
91-
- require:
92-
- git: rtl8821au-source
93-
- cmd: rtl8821au-install
94-
- cmd: rtl8821au-reinstall
95-
- service: rtl8821au-enable-tc2-agent
96-
- service: rtl8821au-enable-tc2-hat-attiny
97-
- unless: test -f "{{ install_marker }}"
9881
{% else %}
9982
rtl8821au-installed:
10083
test.nop:

tc2/rtl8821au/map.jinja

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242
{% set branch = salt['pillar.get']('rtl8821au:branch', 'main') %}
4343
{% set source_dir = salt['pillar.get']('rtl8821au:source_dir', '/usr/local/src/8821au-20210708') %}
44-
{% set install_marker = salt['pillar.get']('rtl8821au:install_marker', source_dir ~ '/.salt-driver-installed') %}
4544
{% set auto_update = salt['pillar.get']('rtl8821au:auto_update', False) %}
4645

4746
{% set rtl8821au = {
@@ -50,7 +49,6 @@
5049
'repo': salt['pillar.get']('rtl8821au:repo', 'https://github.com/morrownr/8821au-20210708.git'),
5150
'branch': branch,
5251
'source_dir': source_dir,
53-
'install_marker': install_marker,
5452
'auto_update': auto_update,
5553
'install_args': salt['pillar.get']('rtl8821au:install_args', ['NoPrompt']),
5654
} %}

0 commit comments

Comments
 (0)