OSS
/
go-libzfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force pool imports and call improved pool search handler

This commit is contained in:
Faruk Kasumovic 2018-09-25 14:27:13 +02:00
parent ca2b45d22f
commit 951202b308
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zpool.go
View File

@ -364,7 +364,7 @@ func poolSearchImport(q string, searchpaths []string, guid bool) (name string,
C.strings_setat(cpaths, C.int(i), csPath) C.strings_setat(cpaths, C.int(i), csPath)
} }
pools := C.zpool_find_import(C.libzfsHandle, C.int(numofp), cpaths) pools := C.go_zpool_search_import(C.libzfsHandle, C.int(numofp), cpaths, C.B_FALSE)
defer C.nvlist_free(pools) defer C.nvlist_free(pools)
elem = C.nvlist_next_nvpair(pools, elem) elem = C.nvlist_next_nvpair(pools, elem)
@ -411,8 +411,8 @@ func poolSearchImport(q string, searchpaths []string, guid bool) (name string,
name = C.GoString(cname) name = C.GoString(cname)
} }
if retcode := C.zpool_import_props(C.libzfsHandle, config, cname, if retcode := C.zpool_import_props(C.libzfsHandle, config, cname,
nil, C.ZFS_IMPORT_NORMAL); retcode != 0 { nil, C.ZFS_IMPORT_NORMAL|C.ZFS_IMPORT_ANY_HOST); retcode != 0 {
err = LastError() err = fmt.Errorf("Import pool properties failed: %s", LastError().Error())
return return
} }
return return