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

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

Browse source 
* include/grub/emu/misc.h (grub_find_mount_point_from_dir)
	(grub_find_zpool_from_mount_point): Merge into ...
	(grub_find_zpool_from_dir): ... this.
	* kern/emu/misc.c: Likewise.
	
	* kern/emu/misc.c
	(grub_make_system_path_relative_to_its_root): Replace
	grub_find_mount_point_from_dir() / grub_find_zpool_from_mount_point()
	with grub_find_zpool_from_dir().
	* kern/emu/getroot.c (find_root_device_from_libzfs): Likewise.
This commit is contained in:
Robert Millan 2010-08-04 13:29:13 +02:00
parent 62858144fe
commit 0de22aa997
4 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kern/emu/getroot.c
View file

@ -181,15 +181,10 @@ find_root_device_from_libzfs (const char *dir)
char *device;
char *poolname;
char *poolfs;
char *mnt_point;
mnt_point = grub_find_mount_point_from_dir (dir);
grub_find_zpool_from_mount_point (mnt_point, &poolname, &poolfs);
grub_find_zpool_from_dir (dir, &poolname, &poolfs);
if (! poolname)
{
free (mnt_point);
return NULL;
}
return NULL;
{
zpool_handle_t *zpool;