Merge branch 'macvtap' into fvs

lmn-client.yml

@@ -96,11 +96,15 @@
       when: groups.localhome is defined and inventory_hostname in groups.localhome
     - role: lmn_teacherlaptop
       when: groups.teacherlaptop is defined and inventory_hostname in groups.teacherlaptop
-    - role: lmn_networkd
-      when: ansible_interfaces | select('search', 'enp.+') | length > 1
 
   tasks:
     ## Temporary fixes and quirks:
+    - name: Remove disturbing NetworkManager connection
+      file:
+        path: "/etc/NetworkManager/system-connections/Wired connection 1"
+        state: absent
+      when: ansible_interfaces | select('search', '^en[pso].+') | length > 1
+
     - name: Fix 8086:4909 external graphics card
       replace:
         dest: "/etc/default/grub"
@@ -276,6 +280,14 @@
         - /etc/sudoers.d/90-lmn-startvirtiofsd
         - /etc/sudoers.d/90-lmn-link-images
         - /etc/rsync.secret
+        - /etc/systemd/network/30-virbr1.netdev
+        - /etc/systemd/network/30-virbr2.netdev
+        - /etc/systemd/network/40-ethernet.network
+        - /etc/systemd/network/40-ethernet-usb.network
+        - /etc/systemd/network/50-virbr1.network
+        - /etc/systemd/network/50-virbr2.network
+        - /etc/systemd/network/60-wlan0-dhcp.network
+        - /etc/NetworkManager/system-connections/macvlan-vm-macvtap.nmconnection
 
     - name: check if vm_usage_information.txt exists
       stat: path=/lmn/vm/vm_usage_information.txt
@@ -304,12 +316,22 @@
           done
       when: not ipp_everywhere.rc
 
+    - name: Remove old VM-printerlists
+      shell:
+        cmd: rm -f /lmn/media/*/.printerlist.csv
+
     - name: Remove Listen on VMBridge
       lineinfile:
         dest: /etc/cups/cupsd.conf
         line: 'Listen 192.168.122.1:631'
         state: absent
 
+    - name: Remove NetworkManager Ansible-Block for non-laptops
+      blockinfile:
+        path: /etc/NetworkManager/NetworkManager.conf
+        state: absent
+      when: groups.laptop is defined and inventory_hostname not in groups.laptop
+
 ## bookworm fixes/hacks:
     - name: Work around sddm hang on shutdown
       ansible.builtin.lineinfile:
@@ -367,7 +389,6 @@
   roles:
     - role: lmn_wlan_iwd
       when: ansible_interfaces | select('search', 'wl.+') | first is defined
-    - lmn_networkd
     - lmn_localuser
   tasks:
     - name: Remove deprecated files and directories (laptop-class)