From 9f5ba90f9fb0aa39de35afaf6e9f385c4ddd8865 Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Tue, 14 Jul 2015 14:28:29 -0400 Subject: [PATCH] Fix zvol detection The zpool create subcomand should not return an error on debug builds of the userland tools when given zvols. Signed-off-by: Richard Yao Signed-off-by: Brian Behlendorf Closes #3595 --- lib/libefi/rdwr_efi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c index b3905d7f3b..785cfe63b2 100644 --- a/lib/libefi/rdwr_efi.c +++ b/lib/libefi/rdwr_efi.c @@ -210,6 +210,12 @@ efi_get_info(int fd, struct dk_cinfo *dki_info) rval = sscanf(dev_path, "/dev/%[a-zA-Z]%hu", dki_info->dki_dname, &dki_info->dki_partition); + } else if ((strncmp(dev_path, "/dev/zd", 7) == 0)) { + strcpy(dki_info->dki_cname, "zd"); + dki_info->dki_ctype = DKC_MD; + rval = sscanf(dev_path, "/dev/%[a-zA-Z]%hu", + dki_info->dki_dname, + &dki_info->dki_partition); } else if ((strncmp(dev_path, "/dev/dm-", 8) == 0)) { strcpy(dki_info->dki_cname, "pseudo"); dki_info->dki_ctype = DKC_VBD;