diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-05-23 01:45:06 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-05-25 00:04:27 +0200 |
| commit | dac9084c7038992d275cde0723cf05a9741a44e3 (patch) | |
| tree | 8c68c4a9ac515235f532b11d372d3756f96a7b4c /roles/zfs/base/tasks | |
| parent | sk-tomnext: fix post-boot script (diff) | |
make use of zfs-mount-generator configureable
Diffstat (limited to 'roles/zfs/base/tasks')
| -rw-r--r-- | roles/zfs/base/tasks/enable-systemd-mount-generator.yml | 23 | ||||
| -rw-r--r-- | roles/zfs/base/tasks/main.yml | 22 |
2 files changed, 26 insertions, 19 deletions
diff --git a/roles/zfs/base/tasks/enable-systemd-mount-generator.yml b/roles/zfs/base/tasks/enable-systemd-mount-generator.yml new file mode 100644 index 00000000..abefbeb1 --- /dev/null +++ b/roles/zfs/base/tasks/enable-systemd-mount-generator.yml @@ -0,0 +1,23 @@ +--- +- name: enable zfs-list-cacher zlet + file: + src: /usr/lib/zfs-linux/zed.d/history_event-zfs-list-cacher.sh + dest: /etc/zfs/zed.d/history_event-zfs-list-cacher.sh + state: link + +- name: create base-directory for zfs-list.cache + file: + path: /etc/zfs/zfs-list.cache/ + state: directory + +- name: create zfs-list.cache file for zpools + loop: "{{ zfs_zpools | dict2items }}" + loop_control: + label: "{{ item.key }}" + copy: + content: "" + dest: "/etc/zfs/zfs-list.cache/{{ item.key }}" + force: no + +## 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 diff --git a/roles/zfs/base/tasks/main.yml b/roles/zfs/base/tasks/main.yml index e86b974b..ad5d1ce2 100644 --- a/roles/zfs/base/tasks/main.yml +++ b/roles/zfs/base/tasks/main.yml @@ -22,25 +22,9 @@ - zfs-zed state: present -- name: enable zfs-list-cacher zlet for systemd zfs-mount-generator - file: - src: /usr/lib/zfs-linux/zed.d/history_event-zfs-list-cacher.sh - dest: /etc/zfs/zed.d/history_event-zfs-list-cacher.sh - state: link - -- name: create base-directory for zfs-list.cache - file: - path: /etc/zfs/zfs-list.cache/ - state: directory - -- name: create zfs-list.cache file for zpools - loop: "{{ zfs_zpools | dict2items }}" - loop_control: - label: "{{ item.key }}" - copy: - content: "" - dest: "/etc/zfs/zfs-list.cache/{{ item.key }}" - force: no +- name: enable systemd -mount-generator + when: zfs_use_systemd_mount_generator + import_tasks: enable-systemd-mount-generator.yml - name: create zpools loop: "{{ zfs_zpools | dict2items }}" |