Update rtl8821au, rpi-net-manager

Author: Zainrax

tc2/rpi-net-manager/init.sls

@@ -1,7 +1,7 @@
 rpi-net-manager-pkg:
   cacophony.pkg_installed_from_github:
     - name: rpi-net-manager
-    - version: "0.7.1"
+    - version: "0.7.3"
     - architecture: "arm64"
 
 rpi-net-manager-service:

tc2/rtl8821au/init.sls

@@ -1,8 +1,8 @@
 {% from "tc2/rtl8821au/map.jinja" import rtl8821au with context %}
 {% set device_present = salt['cacophony.has_usb_device'](rtl8821au['device_ids']) %}
 {% set install_marker = rtl8821au['install_marker'] %}
-{% set already_installed = salt['file.file_exists'](install_marker) %}
-{% set should_install = rtl8821au['auto_update'] or not already_installed %}
+{% set driver_installed = salt['cmd.retcode'](['modinfo', '8821au']) == 0 %}
+{% set should_install = rtl8821au['auto_update'] or not driver_installed %}
 {% set install_command = "./install-driver.sh" %}
 {% if rtl8821au['install_args'] %}
   {% set install_command = install_command + " " + " ".join(rtl8821au['install_args']) %}
@@ -17,6 +17,16 @@ rtl8821au-deps:
 {% endif %}
 
 {% if should_install %}
+rtl8821au-disable-tc2-agent:
+  service.dead:
+    - name: tc2-agent
+    - enable: False
+
+rtl8821au-disable-tc2-hat-attiny:
+  service.dead:
+    - name: tc2-hat-attiny
+    - enable: False
+
 rtl8821au-source:
   git.latest:
     - name: {{ rtl8821au['repo'] }}
@@ -39,6 +49,8 @@ rtl8821au-install:
     - unless: modinfo 8821au
     - require:
       - git: rtl8821au-source
+      - service: rtl8821au-disable-tc2-agent
+      - service: rtl8821au-disable-tc2-hat-attiny
 
 rtl8821au-reinstall:
   cmd.run:
@@ -49,6 +61,26 @@ rtl8821au-reinstall:
       - git: rtl8821au-source
     - require:
       - git: rtl8821au-source
+      - service: rtl8821au-disable-tc2-agent
+      - service: rtl8821au-disable-tc2-hat-attiny
+
+rtl8821au-enable-tc2-agent:
+  service.running:
+    - name: tc2-agent
+    - enable: True
+    - require:
+      - cmd: rtl8821au-install
+      - cmd: rtl8821au-reinstall
+      - service: rtl8821au-disable-tc2-agent
+
+rtl8821au-enable-tc2-hat-attiny:
+  service.running:
+    - name: tc2-hat-attiny
+    - enable: True
+    - require:
+      - cmd: rtl8821au-install
+      - cmd: rtl8821au-reinstall
+      - service: rtl8821au-disable-tc2-hat-attiny
 
 rtl8821au-marker:
   file.managed:
@@ -58,12 +90,16 @@ rtl8821au-marker:
     - onlyif: modinfo 8821au
     - require:
       - git: rtl8821au-source
+      - cmd: rtl8821au-install
+      - cmd: rtl8821au-reinstall
+      - service: rtl8821au-enable-tc2-agent
+      - service: rtl8821au-enable-tc2-hat-attiny
     - unless: test -f "{{ install_marker }}"
 {% else %}
 rtl8821au-installed:
   test.nop:
     - name: rtl8821au
-    - comment: Driver already installed ({{ install_marker }})
+    - comment: Driver already installed (modinfo 8821au)
 {% endif %}
 
 rtl8821au-modprobe-options: