From: alteriks <alteriks@gmail.com>
Date: Sat, 26 Jul 2014 16:45:15 +0000 (+0200)
Subject: Import zfs pools after cryptsetup
X-Git-Tag: zfs-0.6.4~180
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f6a14798d43e20e50dac015e332328ec3eae36f;p=zfs

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 918a258a1..17d90f638 100644
--- 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 ab1b0f693..a93721156 100644
--- 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]