summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-09-05 21:59:29 +0200
committerChristian Pointner <equinox@spreadspace.org>2022-09-05 21:59:29 +0200
commit127c67c6b334009290093d81336dfb0799791250 (patch)
tree1fb1e196de3b60112d1c45791400e76ff85825dc /roles
parentubuntu/installer: fix early command and focal support (diff)
Debian 11+ and Ubuntu 22.04+ have exfat support in kernel
Diffstat (limited to 'roles')
-rw-r--r--roles/elevate/media/tasks/main.yml10
-rw-r--r--roles/ws/base/tasks/main.yml16
2 files changed, 22 insertions, 4 deletions
diff --git a/roles/elevate/media/tasks/main.yml b/roles/elevate/media/tasks/main.yml
index 9de552c1..87815bbc 100644
--- a/roles/elevate/media/tasks/main.yml
+++ b/roles/elevate/media/tasks/main.yml
@@ -5,13 +5,21 @@
- name: install and configure nextcloud
import_tasks: nextcloud.yml
-- name: install exfat
+- name: install exfat packages for legacy installs
+ when: (ansible_distribution == 'Debian' and (ansible_distribution_major_version | int) < 11) or (ansible_distribution == 'Ubuntu' and (ansible_distribution_major_version | int) < 22)
apt:
name:
- exfat-fuse
- exfat-utils
state: present
+- name: install exfat packages for new installs
+ when: (ansible_distribution == 'Debian' and (ansible_distribution_major_version | int) >= 11) or (ansible_distribution == 'Ubuntu' and (ansible_distribution_major_version | int) >= 22)
+ apt:
+ name:
+ - exfatprogs
+ state: present
+
- name: install dstat script
template:
src: dstat.sh.j2
diff --git a/roles/ws/base/tasks/main.yml b/roles/ws/base/tasks/main.yml
index 8a1e8bd5..5b179887 100644
--- a/roles/ws/base/tasks/main.yml
+++ b/roles/ws/base/tasks/main.yml
@@ -36,19 +36,29 @@
name:
- pwgen
- p7zip-rar
- - exfat-fuse
- - exfat-utils
- ntfs-3g
-# - gnupg-curl
- pass
- evince
- geeqie
- file-roller
- cifs-utils
+ state: present
+
+- name: install exfat packages for legacy installs
+ when: (ansible_distribution == 'Debian' and (ansible_distribution_major_version | int) < 11) or (ansible_distribution == 'Ubuntu' and (ansible_distribution_major_version | int) < 22)
+ apt:
+ name:
- exfat-fuse
- exfat-utils
state: present
+- name: install exfat packages for new installs
+ when: (ansible_distribution == 'Debian' and (ansible_distribution_major_version | int) >= 11) or (ansible_distribution == 'Ubuntu' and (ansible_distribution_major_version | int) >= 22)
+ apt:
+ name:
+ - exfatprogs
+ state: present
+
- name: install browser
apt:
name: