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 <turbo@bayour.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3536
This commit is contained in:
Turbo Fredriksson 2015-06-27 14:31:43 +02:00 committed by Brian Behlendorf
parent 84045c2ddf
commit d6c9ff0a6b
1 changed files with 9 additions and 0 deletions

View File

@ -156,6 +156,15 @@ do_import()
ZPOOL_IMPORT_PATH="/dev/disk/by-vdev:" ZPOOL_IMPORT_PATH="/dev/disk/by-vdev:"
fi 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. # ... and /dev at the very end, just for good measure.
ZPOOL_IMPORT_PATH="$ZPOOL_IMPORT_PATH$dirs:/dev" ZPOOL_IMPORT_PATH="$ZPOOL_IMPORT_PATH$dirs:/dev"
fi fi