tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osdep/hurd: Support device entries with @/dev/disk: qualifier

Browse Source 
Those are used with non-bootstrap disk drivers, for which libstore has to
open /dev/disk before calling device_open on it instead of on the device
master port. Normally in that case all /dev/ entries also have the @/dev/disk:
qualifier, so we can just drop it.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Samuel Thibault 2022-04-27 23:00:29 +02:00 committed by Daniel Kiper
parent bda136e1bb
commit ea1b565e8c
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
grub-core/osdep/hurd/getroot.c
View File

@ -112,9 +112,23 @@ grub_util_find_hurd_root_device (const char *path)
if (strncmp (name, "device:", sizeof ("device:") - 1) == 0)
{
char *dev_name = name + sizeof ("device:") - 1;
size_t size = sizeof ("/dev/") - 1 + strlen (dev_name) + 1;
size_t size;
char *next;
ret = malloc (size);
if (dev_name[0] == '@')
{
/*
* Non-bootstrap disk driver, the /dev/ entry is normally set up with
* the same @.
*/
char *next_name = strchr (dev_name, ':');
if (next_name)
dev_name = next_name + 1;
}
size = sizeof ("/dev/") - 1 + strlen (dev_name) + 1;
ret = xmalloc (size);
next = stpncpy (ret, "/dev/", size);
stpncpy (next, dev_name, size - (next - ret));
}

17
grub-core/osdep/hurd/hostdisk.c
View File

@ -87,6 +87,23 @@ grub_util_hurd_get_disk_info (const char *dev, grub_uint32_t *secsize, grub_disk
*parent = xmalloc (len+1);
memcpy (*parent, data, len);
(*parent)[len] = '\0';
if ((*parent)[0] == '@')
{
/*
* Non-bootstrap disk driver, the /dev/ entry is normally set up with
* the same @.
*/
char *next_path = strchr (*parent, ':');
if (next_path)
{
char *n = xstrdup (next_path + 1);
free (*parent);
*parent = n;
}
}
}
}
if (offset)