2010-08-01 Robert Millan <rmh@gnu.org>

Prevent accidental use of uninitialized libzfs_handle.
	
	* util/grub-probe.c (main): Move grub_util_init_libzfs() call to ...
	* kern/emu/getroot.c (find_root_device_from_libzfs): ... here.
	* util/misc.c (grub_util_init_libzfs): Make this function idempotent.

kern/emu/getroot.c

@@ -289,6 +289,8 @@ find_root_device_from_libzfs (const char *dir)
     nvlist_t **nvlist_array;
     unsigned int nvlist_count;
 
+    grub_util_init_libzfs ();
+
     zpool = zpool_open (libzfs_handle, poolname);
     nvlist = zpool_get_config (zpool, NULL);