vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Robert Millan 2010-08-01 15:23:44 +02:00
parent ce04ef47e2
commit deb0caa38e
4 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kern/emu/getroot.c
View file

@ -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);