External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-29 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use different separator for lvs command to unbreak parsing for encrypted devs.

Browse Source
This commit is contained in:
Cole Robinson 2008-11-14 16:10:47 +00:00
parent 94359e16d3
commit 00e8a7a491
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Nov 14 09:40:00 EST 2008 Cole Robinson <crobinso@redhat.com>
* src/storage_backend_logical.c: Use different separator for lvs
command to unbreak parsing for encrypted devices.
Fri Nov 14 13:22:36 +0100 2008 Jim Meyering <meyering@redhat.com> Fri Nov 14 13:22:36 +0100 2008 Jim Meyering <meyering@redhat.com>
avoid format string warnings avoid format string warnings

21
src/storage_backend_logical.c
View File

@ -173,27 +173,30 @@ virStorageBackendLogicalFindLVs(virConnectPtr conn,
virStorageVolDefPtr vol) virStorageVolDefPtr vol)
{ {
/* /*
* # lvs --separator : --noheadings --units b --unbuffered --nosuffix --options "lv_name,uuid,devices,seg_size,vg_extent_size" VGNAME * # lvs --separator , --noheadings --units b --unbuffered --nosuffix --options "lv_name,uuid,devices,seg_size,vg_extent_size" VGNAME
* RootLV:06UgP5-2rhb-w3Bo-3mdR-WeoL-pytO-SAa2ky:/dev/hda2(0):5234491392:33554432 * RootLV,06UgP5-2rhb-w3Bo-3mdR-WeoL-pytO-SAa2ky,/dev/hda2(0),5234491392,33554432
* SwapLV:oHviCK-8Ik0-paqS-V20c-nkhY-Bm1e-zgzU0M:/dev/hda2(156):1040187392:33554432 * SwapLV,oHviCK-8Ik0-paqS-V20c-nkhY-Bm1e-zgzU0M,/dev/hda2(156),1040187392,33554432
* Test2:3pg3he-mQsA-5Sui-h0i6-HNmc-Cz7W-QSndcR:/dev/hda2(219):1073741824:33554432 * Test2,3pg3he-mQsA-5Sui-h0i6-HNmc-Cz7W-QSndcR,/dev/hda2(219),1073741824,33554432
* Test3:UB5hFw-kmlm-LSoX-EI1t-ioVd-h7GL-M0W8Ht:/dev/hda2(251):2181038080:33554432 * Test3,UB5hFw-kmlm-LSoX-EI1t-ioVd-h7GL-M0W8Ht,/dev/hda2(251),2181038080,33554432
* Test3:UB5hFw-kmlm-LSoX-EI1t-ioVd-h7GL-M0W8Ht:/dev/hda2(187):1040187392:33554432 * Test3,UB5hFw-kmlm-LSoX-EI1t-ioVd-h7GL-M0W8Ht,/dev/hda2(187),1040187392,33554432
* *
* Pull out name & uuid, device, device extent start #, segment size, extent size. * Pull out name & uuid, device, device extent start #, segment size, extent size.
* *
* NB can be multiple rows per volume if they have many extents * NB can be multiple rows per volume if they have many extents
* *
* NB lvs from some distros (e.g. SLES10 SP2) outputs trailing ":" on each line * NB lvs from some distros (e.g. SLES10 SP2) outputs trailing "," on each line
*
* NB Encrypted logical volumes can print ':' in their name, so it is
* not a suitable separator (rhbz 470693).
*/ */
const char *regexes[] = { const char *regexes[] = {
"^\\s*(\\S+):(\\S+):(\\S+)\\((\\S+)\\):(\\S+):([0-9]+):?\\s*$" "^\\s*(\\S+),(\\S+),(\\S+)\\((\\S+)\\),(\\S+),([0-9]+),?\\s*$"
}; };
int vars[] = { int vars[] = {
6 6
}; };
const char *prog[] = { const char *prog[] = {
LVS, "--separator", ":", "--noheadings", "--units", "b", LVS, "--separator", ",", "--noheadings", "--units", "b",
"--unbuffered", "--nosuffix", "--options", "--unbuffered", "--nosuffix", "--options",
"lv_name,uuid,devices,seg_size,vg_extent_size", "lv_name,uuid,devices,seg_size,vg_extent_size",
pool->def->source.name, NULL pool->def->source.name, NULL