From 45407df3403a00c45502713c3ecc2043dfb7f5e2 Mon Sep 17 00:00:00 2001 From: alteriks Date: Sat, 26 Jul 2014 18:45:15 +0200 Subject: [PATCH] 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 Signed-off-by: Brian Behlendorf Closes #1474 --- etc/systemd/system/zfs-import-cache.service.in | 1 + etc/systemd/system/zfs-import-scan.service.in | 1 + 2 files changed, 2 insertions(+) diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in index 918a258a1aa8..17d90f638993 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 ab1b0f693528..a937211569c9 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]