Import zfs pools after cryptsetup

The zfs-import-cache.service and zfs-import-scan.service should
should be started after cryptsetup to ensure all LUKS devices have
been opened.

Signed-off-by: alteriks <alteriks@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1474

diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in
index 918a258a1aa86b677cdb3e8809dbe64f8277ea38..17d90f6389938bdcc214e75eeed30ac69b4d1725 100644 (file)
--- a/etc/systemd/system/zfs-import-cache.service.in
+++ b/etc/systemd/system/zfs-import-cache.service.in
@@ -3,6 +3,7 @@ Description=Import ZFS pools by cache file
 DefaultDependencies=no
 Requires=systemd-udev-settle.service
 After=systemd-udev-settle.service
+After=cryptsetup.target
 ConditionPathExists=@sysconfdir@/zfs/zpool.cache
 
 [Service]

diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
index ab1b0f693528c28a0bd5f923e988bcc8ccd31144..a937211569c99a5425bd1b23c62f4992d4536eed 100644 (file)
--- a/etc/systemd/system/zfs-import-scan.service.in
+++ b/etc/systemd/system/zfs-import-scan.service.in
@@ -3,6 +3,7 @@ Description=Import ZFS pools by device scanning
 DefaultDependencies=no
 Requires=systemd-udev-settle.service
 After=systemd-udev-settle.service
+After=cryptsetup.target
 ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
 
 [Service]