summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-08-12 23:47:51 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-08-12 23:47:51 +0200
commit71def7689698ed941eef9491109cb1d588eb16b8 (patch)
tree1b1cfa80701e64999df90b152b63b8c3a499fa24 /roles
parentequinox-ws: install kicad libs (diff)
add hacky workaround for zfs-mount-generator bug
Diffstat (limited to 'roles')
-rw-r--r--roles/zfs/base/tasks/enable-systemd-mount-generator.yml8
-rw-r--r--roles/zfs/base/tasks/main.yml2
2 files changed, 9 insertions, 1 deletions
diff --git a/roles/zfs/base/tasks/enable-systemd-mount-generator.yml b/roles/zfs/base/tasks/enable-systemd-mount-generator.yml
index abefbeb1..46e709da 100644
--- a/roles/zfs/base/tasks/enable-systemd-mount-generator.yml
+++ b/roles/zfs/base/tasks/enable-systemd-mount-generator.yml
@@ -21,3 +21,11 @@
## TODO: if this is installed after the zpool has already been created zed needs to be triggered
## using someing like: zfs set canmount=on DATASET
+
+### HACK HACK HACK (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=966565)
+- name: patch zfs mount generator (Debian Bug 966565)
+ when: ansible_distribution == 'Debian'
+ lineinfile:
+ path: /usr/lib/systemd/system-generators/zfs-mount-generator
+ regexp: '^pools=\$\(zpool list -H -o name\)$'
+ line: "pools=$(zpool list -H -o name || true)"
diff --git a/roles/zfs/base/tasks/main.yml b/roles/zfs/base/tasks/main.yml
index db5cfe2d..54e716a6 100644
--- a/roles/zfs/base/tasks/main.yml
+++ b/roles/zfs/base/tasks/main.yml
@@ -22,7 +22,7 @@
- zfs-zed
state: present
-- name: enable systemd -mount-generator
+- name: enable systemd mount-generator
when: zfs_use_systemd_mount_generator
import_tasks: enable-systemd-mount-generator.yml