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

* grub-core/kern/emu/hostdisk.c

Browse source 
(convert_system_partition_to_system_disk): Handle devices like "sdaa1".
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-11-07 00:10:49 +01:00
parent 4a1a0153c3
commit 80c6d25eef
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-11-07 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/emu/hostdisk.c
(convert_system_partition_to_system_disk): Handle devices like "sdaa1".
2010-11-06 Vladimir Serbinenko <phcoder@gmail.com> 2010-11-06 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/emu/misc.h: Don't include grub/util/libzfs.h. * include/grub/emu/misc.h: Don't include grub/util/libzfs.h.

14
grub-core/kern/emu/hostdisk.c
View file

@ -1152,16 +1152,22 @@ convert_system_partition_to_system_disk (const char *os_dev, struct stat *st)
|| strncmp ("sd", p, 2) == 0) || strncmp ("sd", p, 2) == 0)
&& p[2] >= 'a' && p[2] <= 'z') && p[2] >= 'a' && p[2] <= 'z')
{ {
/* /dev/[hsv]d[a-z][0-9]* */ char *pp = p + 2;
p[3] = '\0'; while (*pp >= 'a' && *pp <= 'z')
pp++;
/* /dev/[hsv]d[a-z]+[0-9]* */
*pp = '\0';
return path; return path;
} }
/* If this is a Xen virtual block device. */ /* If this is a Xen virtual block device. */
if ((strncmp ("xvd", p, 3) == 0) && p[3] >= 'a' && p[3] <= 'z') if ((strncmp ("xvd", p, 3) == 0) && p[3] >= 'a' && p[3] <= 'z')
{ {
/* /dev/xvd[a-z][0-9]* */ char *pp = p + 3;
p[4] = '\0'; while (*pp >= 'a' && *pp <= 'z')
pp++;
/* /dev/xvd[a-z]+[0-9]* */
*pp = '\0';
return path; return path;
} }