From d6c9ff0a6be1e4b87f71a641a8973070ec46d01b Mon Sep 17 00:00:00 2001 From: Turbo Fredriksson Date: Sat, 27 Jun 2015 14:31:43 +0200 Subject: [PATCH] Add /dev/mapper to the list of possible sources for pool devices. This is especially needed when using LUKS backed pools. Signed-off-by: Turbo Fredriksson Signed-off-by: Brian Behlendorf Closes #3536 --- etc/init.d/zfs-import.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/etc/init.d/zfs-import.in b/etc/init.d/zfs-import.in index dc674c49e..fed364a60 100755 --- a/etc/init.d/zfs-import.in +++ b/etc/init.d/zfs-import.in @@ -156,6 +156,15 @@ do_import() ZPOOL_IMPORT_PATH="/dev/disk/by-vdev:" fi + # Help with getting LUKS partitions etc imported. + if [ -d "/dev/mapper" ]; then + if [ -n "$ZPOOL_IMPORT_PATH" ]; then + ZPOOL_IMPORT_PATH="$ZPOOL_IMPORT_PATH:/dev/mapper:" + else + ZPOOL_IMPORT_PATH="/dev/mapper:" + fi + fi + # ... and /dev at the very end, just for good measure. ZPOOL_IMPORT_PATH="$ZPOOL_IMPORT_PATH$dirs:/dev" fi