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

* util/getroot.c (grub_find_root_devices_from_mountinfo): Handle

Browse source 
"zfs" and "fuse.zfs" as synonyms.
This commit is contained in:
Richard Laager 2012-02-27 20:14:26 +01:00 committed by Vladimir 'phcoder' Serbinenko
parent 071114bb3e
commit f122e0d648
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-27 Richard Laager <rlaager@wiktel.com>
* util/getroot.c (grub_find_root_devices_from_mountinfo): Handle
"zfs" and "fuse.zfs" as synonyms.
2012-02-27 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Put platform and target_cpu substitutions back since * configure.ac: Put platform and target_cpu substitutions back since

3
util/getroot.c
View file

@ -601,7 +601,8 @@ grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
if (!*entries[i].device) if (!*entries[i].device)
continue; continue;
if (grub_strcmp (entries[i].fstype, "fuse.zfs") == 0) if (grub_strcmp (entries[i].fstype, "fuse.zfs") == 0
|| grub_strcmp (entries[i].fstype, "zfs") == 0)
{ {
char *slash; char *slash;
slash = strchr (entries[i].device, '/'); slash = strchr (entries[i].device, '/');