Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-07-07 15:35:09 -07:00
parent 53970c3123 15c4a8be0c
commit 99c5acfe16
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libzfs/libzfs_pool.c
View File

@ -1763,8 +1763,9 @@ is_guid_type(zpool_handle_t *zhp, uint64_t guid, const char *type)
static int static int
zpool_relabel_disk(libzfs_handle_t *hdl, const char *name) zpool_relabel_disk(libzfs_handle_t *hdl, const char *name)
{ {
char path[MAXPATHLEN];
char errbuf[1024]; char errbuf[1024];
#ifdef HAVE_LIBEFI
char path[MAXPATHLEN];
int fd, error; int fd, error;
int (*_efi_use_whole_disk)(int); int (*_efi_use_whole_disk)(int);
@ -1793,6 +1794,11 @@ zpool_relabel_disk(libzfs_handle_t *hdl, const char *name)
return (zfs_error(hdl, EZFS_NOCAP, errbuf)); return (zfs_error(hdl, EZFS_NOCAP, errbuf));
} }
return (0); return (0);
#else
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "cannot "
"relabel '%s/%s': libefi is unsupported"), DISK_ROOT, name);
return (zfs_error(hdl, EZFS_NOTSUP, errbuf));
#endif /* HAVE_LIBEFI */
} }
/* /*