Skip to content

Commit

Permalink
Import zfs pools after cryptsetup
Browse files Browse the repository at this point in the history
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 openzfs#1474
  • Loading branch information
alteriks authored and ryao committed Nov 29, 2014
1 parent 29a4bc4 commit 45407df
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions etc/systemd/system/zfs-import-cache.service.in
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions etc/systemd/system/zfs-import-scan.service.in
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit 45407df

Please sign in to comment.