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

grub-install: support for partitioned partx loop devices.

Browse source 
* grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Detect
	/dev/loopX as being the parent of /dev/loopXpY.
This commit is contained in:
Mike Gilbert 2014-01-26 02:56:04 +01:00 committed by Vladimir Serbinenko
parent 9afe2053c9
commit 35f2d96c0d
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2014-01-26 Mike Gilbert <floppym@gentoo.org>
grub-install: support for partitioned partx loop devices.
* grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Detect
/dev/loopX as being the parent of /dev/loopXpY.
2014-01-26 Vladimir Serbinenko <phcoder@gmail.com> 2014-01-26 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/serial.c (grub_serial_register): Fix invalid free. * grub-core/term/serial.c (grub_serial_register): Fix invalid free.

13
grub-core/osdep/linux/getroot.c
View file

@ -883,6 +883,19 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
*pp = '\0'; *pp = '\0';
return path; return path;
} }
/* If this is a loop device */
if ((strncmp ("loop", p, 4) == 0) && p[4] >= '0' && p[4] <= '9')
{
char *pp = p + 4;
while (*pp >= '0' && *pp <= '9')
pp++;
if (*pp == 'p')
*is_part = 1;
/* /dev/loop[0-9]+p[0-9]* */
*pp = '\0';
return path;
}
} }
return path; return path;