From 67fa63ccb56a5f85d774a628474929e0c1a166b0 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Wed, 2 Jun 2021 23:42:04 +0200
Subject: [PATCH] update..

---
 group_vars/all/main.yml     | 11 ++++++++---
 roles/common/tasks/apt.yml  | 22 ++++++++++++++++++----
 roles/common/tasks/main.yml |  6 ++++++
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index f5ec872..01514ea 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -557,10 +557,13 @@ microcode_intel_package:
 microcode_amd_package:
   - amd64-microcode
 
-firmware_packages:
+firmware_packages_ubuntu:
+  - linux-firmware
+
+firmware_packages_debian:
   - firmware-linux
 
-firmware_non_free_packages:
+firmware_non_free_packages_debian:
    - firmware-linux-nonfree
 
 apt_install_state: latest
@@ -1348,7 +1351,9 @@ sudoers_server_file_user_privileges: []
 sudoers_server_file_group_privileges: []
 
 
-
+# ========================================
+# ========================================
+# ========================================
 
 
 # ---
diff --git a/roles/common/tasks/apt.yml b/roles/common/tasks/apt.yml
index 19190a9..202deb7 100644
--- a/roles/common/tasks/apt.yml
+++ b/roles/common/tasks/apt.yml
@@ -228,22 +228,36 @@
 # Firmware
 # ---
 
-- name: (apt.yml) Install Firmware packages
+- name: (apt.yml) Install Firmware packages (Ubuntu)
   apt:
-     name: "{{ firmware_non_free_packages }}"
+     name: "{{ firmware_packages_ubuntu }}"
      state: present
      default_release: "{{ ansible_distribution_release }}"
+  when:
+    - ansible_facts['distribution'] == "Ubuntu"
+  tags:
+    - apt-initial-install
+    - apt-firmware
+
+- name: (apt.yml) Install Firmware packages (Debian)
+  apt:
+     name: "{{ firmware_packages_debian }}"
+     state: present
+     default_release: "{{ ansible_distribution_release }}"
+  when:
+    - ansible_facts['distribution'] == "Debian"
   tags:
     - apt-initial-install
     - apt-firmware
 
 
-- name: (apt.yml) Install non-free Firmware packages
+- name: (apt.yml) Install non-free Firmware packages (Debian)
   apt:
-     name: "{{ firmware_non_free_packages }}"
+     name: "{{ firmware_non_free_packages_debian }}"
      state: present
      default_release: "{{ ansible_distribution_release }}"
   when:
+    - ansible_facts['distribution'] == "Debian"
     - apt_debian_contrib_nonfree_enable
   tags:
     - apt-initial-install
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 56684e6..4afb43f 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -143,6 +143,12 @@
     - samba-shares
 
 
+#- import_tasks: mount_samba_shares.yml
+#  when: "groups['client_pc']|string is search(inventory_hostname)"
+#  tags:
+#    - samba-shares
+
+
 # tags supported system-user-systemfiles.yml:
 #
 #    profile