diff options
| author | alteriks <[email protected]> | 2014-07-26 18:45:15 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-09-04 09:50:45 -0700 |
| commit | 4f6a14798d43e20e50dac015e332328ec3eae36f (patch) | |
| tree | 72a2de8eb44ade080e8162bb6dac093efccd43c7 | |
| parent | 0dfc732416922e1dd59028fa900d38d04dceaa12 (diff) | |
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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #1474
| -rw-r--r-- | etc/systemd/system/zfs-import-cache.service.in | 1 | ||||
| -rw-r--r-- | etc/systemd/system/zfs-import-scan.service.in | 1 |
2 files changed, 2 insertions, 0 deletions
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] |