From 2b87d50a1de27a2ee029d417d7ec661725a0e8cb Mon Sep 17 00:00:00 2001
From: Benoit S <git@benpro.fr>
Date: Sun, 31 Jan 2021 20:05:25 +0900
Subject: [PATCH] Add mount for ZFS and zfs-load-key unit file

---
 files/zfs-load-key.service | 13 +++++++++++++
 setup-zfs-and-lxd.py       |  6 ++++++
 2 files changed, 19 insertions(+)
 create mode 100644 files/zfs-load-key.service

diff --git a/files/zfs-load-key.service b/files/zfs-load-key.service
new file mode 100644
index 0000000..28e4863
--- /dev/null
+++ b/files/zfs-load-key.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Load encryption keys
+DefaultDependencies=no
+After=zfs-import.target
+Before=zfs-mount.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/zfs load-key -a
+
+[Install]
+WantedBy=zfs-mount.service
diff --git a/setup-zfs-and-lxd.py b/setup-zfs-and-lxd.py
index 0e0404a..599f4a6 100644
--- a/setup-zfs-and-lxd.py
+++ b/setup-zfs-and-lxd.py
@@ -105,3 +105,9 @@ if not host.fact.command('zfs list | grep exports || true'):
         name='Create ZFS volume exports',
         commands=['zfs create local/exports -o mountpoint=/var/backups/lxd']
     )
+
+server.shell(
+    name='Mount local/exports',
+    commands=['zfs mount local/exports'],
+)
+