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

2008-05-07 Ian Campbell <ijc@hellion.org.uk>

Browse source 
* util/biosdisk.c (get_os_disk): Recognise xvd type disks.
	* util/grub-mkdevicemap.c (get_xvd_disk_name): New function.
	(make_device_map): Output entries for xvd type disks.
This commit is contained in:
proski 2008-05-07 20:46:57 +00:00
parent b56c4eaa3f
commit ed7593907d
3 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-05-07 Ian Campbell <ijc@hellion.org.uk>
* util/biosdisk.c (get_os_disk): Recognise xvd type disks.
* util/grub-mkdevicemap.c (get_xvd_disk_name): New function.
(make_device_map): Output entries for xvd type disks.
2008-05-07 Robert Millan <rmh@aybabtu.com> 2008-05-07 Robert Millan <rmh@aybabtu.com>
* util/biosdisk.c (linux_find_partition, get_os_disk): Handle CCISS * util/biosdisk.c (linux_find_partition, get_os_disk): Handle CCISS

8
util/biosdisk.c
View file

@ -677,6 +677,14 @@ get_os_disk (const char *os_dev)
p[3] = '\0'; p[3] = '\0';
return path; return path;
} }
/* If this is a Xen virtual block device. */
if ((strncmp ("xvd", p, 3) == 0) && p[3] >= 'a' && p[3] <= 'z')
{
/* /dev/xvd[a-z][0-9]* */
p[4] = '\0';
return path;
}
} }
return path; return path;

22
util/grub-mkdevicemap.c
View file

@ -289,6 +289,12 @@ get_cciss_disk_name (char *name, int controller, int drive)
{ {
sprintf (name, "/dev/cciss/c%dd%d", controller, drive); sprintf (name, "/dev/cciss/c%dd%d", controller, drive);
} }
static void
get_xvd_disk_name (char *name, int unit)
{
sprintf (name, "/dev/xvd%c", unit + 'a');
}
#endif #endif
/* Check if DEVICE can be read. If an error occurs, return zero, /* Check if DEVICE can be read. If an error occurs, return zero,
@ -464,6 +470,22 @@ make_device_map (const char *device_map, int floppy_disks)
num_hd++; num_hd++;
} }
} }
/* Xen virtual block devices. */
for (i = 0; i < 16; i++)
{
char name[16];
get_xvd_disk_name (name, i);
if (check_device (name))
{
char *p;
p = grub_util_get_disk_name (num_hd, name);
fprintf (fp, "(%s)\t%s\n", p, name);
free (p);
num_hd++;
}
}
#endif /* __linux__ */ #endif /* __linux__ */
/* The rest is SCSI disks. */ /* The rest is SCSI disks. */