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

* docs/grub.texi (Device syntax): Document new LVM UUID based device

Browse source 
names; fix LVM driver name (lvm, not lv).
	* util/grub-probe.c (probe_abstraction): Support lvmid/xxx device
	names.
This commit is contained in:
Andrey Borzenkov 2013-09-22 21:35:13 +04:00
parent 3ff4063dd3
commit 775b284dd6
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2013-09-22 Andrey Borzenkov <arvidjaar@gmail.com>
* docs/grub.texi (Device syntax): Document new LVM UUID based device
names; fix LVM driver name (lvm, not lv).
* util/grub-probe.c (probe_abstraction): Support lvmid/xxx device
names.
2013-09-22 Vladimir Serbinenko <phcoder@gmail.com> 2013-09-22 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/emu/hostdisk.c: Disentagle into a series of OS-specific * grub-core/kern/emu/hostdisk.c: Disentagle into a series of OS-specific

8
docs/grub.texi
View file

@ -2484,7 +2484,7 @@ by a digit, like @samp{fd0}, or @samp{cd}.
AHCI, PATA (ata), crypto, USB use the name of driver followed by a number. AHCI, PATA (ata), crypto, USB use the name of driver followed by a number.
Memdisk and host are limited to one disk and so it's refered just by driver Memdisk and host are limited to one disk and so it's refered just by driver
name. name.
RAID (md), ofdisk (ieee1275 and nand), LVM (lv), LDM and arcdisk (arc) use RAID (md), ofdisk (ieee1275 and nand), LVM (lvm), LDM and arcdisk (arc) use
intrinsic name of disk prefixed by driver name. Additionally just ``nand'' intrinsic name of disk prefixed by driver name. Additionally just ``nand''
refers to the disk aliased as ``nand''. refers to the disk aliased as ``nand''.
Conflicts are solved by suffixing a number if necessarry. Conflicts are solved by suffixing a number if necessarry.
@ -2493,7 +2493,8 @@ Loopback uses whatever name specified to @command{loopback} command.
Hostdisk uses names specified in device.map as long as it's of the form Hostdisk uses names specified in device.map as long as it's of the form
[fhc]d[0-9]* or hostdisk/<OS DEVICE>. [fhc]d[0-9]* or hostdisk/<OS DEVICE>.
For crypto and RAID (md) additionally you can use the syntax For crypto and RAID (md) additionally you can use the syntax
<driver name>uuid/<uuid>. <driver name>uuid/<uuid>. For LVM additionally you can use the syntax
lvmid/<volume-group-uuid>/<volume-uuid>.
@example @example
(fd0) (fd0)
@ -2505,7 +2506,8 @@ For crypto and RAID (md) additionally you can use the syntax
(usb0) (usb0)
(cryptouuid/123456789abcdef0123456789abcdef0) (cryptouuid/123456789abcdef0123456789abcdef0)
(mduuid/123456789abcdef0123456789abcdef0) (mduuid/123456789abcdef0123456789abcdef0)
(lv/system-root) (lvm/system-root)
(lvmid/F1ikgD-2RES-306G-il9M-7iwa-4NKW-EbV1NV/eLGuCQ-L4Ka-XUgR-sjtJ-ffch-bajr-fCNfz5)
(md/myraid) (md/myraid)
(md/0) (md/0)
(ieee1275/disk2) (ieee1275/disk2)

3
util/grub-probe.c
View file

@ -292,7 +292,8 @@ probe_abstraction (grub_disk_t disk)
} }
if (disk->dev->id == GRUB_DISK_DEVICE_DISKFILTER_ID if (disk->dev->id == GRUB_DISK_DEVICE_DISKFILTER_ID
&& grub_memcmp (disk->name, "lvm/", sizeof ("lvm/") - 1) == 0) && (grub_memcmp (disk->name, "lvm/", sizeof ("lvm/") - 1) == 0 ||
grub_memcmp (disk->name, "lvmid/", sizeof ("lvmid/") - 1) == 0))
printf ("lvm "); printf ("lvm ");
if (disk->dev->id == GRUB_DISK_DEVICE_DISKFILTER_ID if (disk->dev->id == GRUB_DISK_DEVICE_DISKFILTER_ID