From 72a134fcbf6277452039d86470d3cf10bcdb371b Mon Sep 17 00:00:00 2001 From: "Andreas B. Mundt" Date: Wed, 7 Feb 2024 16:42:09 +0100 Subject: [PATCH] Fixes for the laptop role merged before. Packages need to be installed before messing around with network configurations. --- roles/lmn_fvs/tasks/main.yml | 1 + roles/lmn_networkd/tasks/main.yml | 8 -------- roles/lmn_vm/tasks/main.yml | 6 ------ roles/lmn_wlan_iwd/tasks/main.yml | 7 ++++--- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/roles/lmn_fvs/tasks/main.yml b/roles/lmn_fvs/tasks/main.yml index c21adbf..bf97e97 100644 --- a/roles/lmn_fvs/tasks/main.yml +++ b/roles/lmn_fvs/tasks/main.yml @@ -47,6 +47,7 @@ - nmap - pdf-presenter-console - php-cli + - pipx - planner - pulseview - python3-websockets diff --git a/roles/lmn_networkd/tasks/main.yml b/roles/lmn_networkd/tasks/main.yml index 3f80187..31e9742 100644 --- a/roles/lmn_networkd/tasks/main.yml +++ b/roles/lmn_networkd/tasks/main.yml @@ -1,6 +1,5 @@ --- # temporary disable network manager -# in future network manager will be used for wifi sticks - name: Use iwd but ignore interfaces managed by systemd-networkd (wlan0,en*) blockinfile: dest: /etc/NetworkManager/NetworkManager.conf @@ -20,13 +19,6 @@ #state: started enabled: true -- name: install firmware for wifi-sticks - apt: - name: - - firmware-realtek - state: latest - autoremove: true - - name: Configure systemd-networkd virbr1.netdev ansible.builtin.copy: dest: "/etc/systemd/network/30-{{ item }}.netdev" diff --git a/roles/lmn_vm/tasks/main.yml b/roles/lmn_vm/tasks/main.yml index 3409db2..0d87a4e 100644 --- a/roles/lmn_vm/tasks/main.yml +++ b/roles/lmn_vm/tasks/main.yml @@ -235,12 +235,6 @@ - /usr/local/share/desktop-directories notify: Run update-desktop-database -- name: Set owner lmnsynci for menu entry directory - file: - path: /usr/local/share/applications - state: directory - owner: lmnsynci - - name: Copy fvs.directory ansible.builtin.copy: src: fvs.directory diff --git a/roles/lmn_wlan_iwd/tasks/main.yml b/roles/lmn_wlan_iwd/tasks/main.yml index 8eb2960..6d627be 100644 --- a/roles/lmn_wlan_iwd/tasks/main.yml +++ b/roles/lmn_wlan_iwd/tasks/main.yml @@ -2,11 +2,12 @@ ## wget https://cdimage.debian.org/cdimage/firmware/testing/current/firmware.cpio.gz ## cat initrd.gz firmware.cpio.gz > initrd-fw.gz --- -- name: Install iwd +- name: Install packages related to iwd ansible.builtin.apt: name: - iwd - systemd-resolved + - firmware-realtek # for our wifi sticks state: latest - name: Disable wpa-supplicant @@ -39,7 +40,7 @@ # wifi.backend=iwd # match-device=interface-name:wl* # managed=0 - # + # # - name: Configure systemd-networkd # ansible.builtin.copy: # dest: /etc/systemd/network/80-wlan-dhcp.network @@ -50,7 +51,7 @@ # DHCP=yes # [DHCPv4] # UseDomains=true - # + # - name: Enable systemd-networkd ansible.builtin.systemd: name: systemd-networkd.service