November 2018 - lvm2-commits - Fedora Mailing-Lists

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=74731a5277eb0234790... Commit: 74731a5277eb02347902801c4ec5b087deecc580 Parent: e3a22cdc31c38939efd51dd9a3a82e034adc21c5 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Nov 20 16:01:12 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Nov 29 23:10:08 2018 +0100 tests: add mising udev_wait mdadm does not handle udev waiting so it may exit earlier, while devices are still 'running'. --- test/shell/lvm-on-md.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/test/shell/lvm-on-md.sh b/test/shell/lvm-on-md.sh index ec8cc23..a3e83d9 100644 --- a/test/shell/lvm-on-md.sh +++ b/test/shell/lvm-on-md.sh @@ -52,6 +52,7 @@ pvs vgchange -an $vg mdadm --stop "$mddev" +aux udev_wait # with md superblock 1.0 this pvs will report duplicates # for the two md legs since the md device itself is not @@ -70,6 +71,7 @@ lvs $vg # start the md dev mdadm --assemble "$mddev" "$dev1" "$dev2" +aux udev_wait # Now that the md dev is online, pvs can see it and # ignore the two legs, so there's no duplicate warning

5 years, 4 months

1
0
0 / 0

master - make: generate man update

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e3a22cdc31c38939efd... Commit: e3a22cdc31c38939efd51dd9a3a82e034adc21c5 Parent: fc482406ec4e0607a9d7335ac927c64b361cad1c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Nov 29 23:08:25 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Nov 29 23:10:08 2018 +0100 make: generate man update --- man/lvchange.8_pregen | 12 +--- man/lvconvert.8_pregen | 36 ++++++++++--- man/lvcreate.8_pregen | 3 - man/lvdisplay.8_pregen | 11 +--- man/lvextend.8_pregen | 2 - man/lvm-fullreport.8_pregen | 11 +--- man/lvm-lvpoll.8_pregen | 2 - man/lvmconfig.8_pregen | 2 - man/lvmdiskscan.8_pregen | 11 +--- man/lvreduce.8_pregen | 2 - man/lvremove.8_pregen | 2 - man/lvrename.8_pregen | 2 - man/lvresize.8_pregen | 2 - man/lvs.8_pregen | 11 +--- man/lvscan.8_pregen | 11 +--- man/pvchange.8_pregen | 2 - man/pvck.8_pregen | 2 - man/pvcreate.8_pregen | 120 +++++++++++++++++++++++++++++++----------- man/pvdisplay.8_pregen | 11 +--- man/pvmove.8_pregen | 9 ++- man/pvremove.8_pregen | 2 - man/pvresize.8_pregen | 2 - man/pvs.8_pregen | 11 +--- man/pvscan.8_pregen | 111 +++++++++++++--------------------------- man/vgcfgbackup.8_pregen | 11 +--- man/vgcfgrestore.8_pregen | 2 - man/vgchange.8_pregen | 15 ++---- man/vgck.8_pregen | 2 - man/vgconvert.8_pregen | 21 ++++---- man/vgcreate.8_pregen | 24 +++++---- man/vgdisplay.8_pregen | 11 +--- man/vgexport.8_pregen | 2 - man/vgextend.8_pregen | 17 +++---- man/vgimport.8_pregen | 2 - man/vgimportclone.8_pregen | 2 - man/vgmerge.8_pregen | 2 - man/vgmknodes.8_pregen | 2 - man/vgreduce.8_pregen | 2 - man/vgremove.8_pregen | 2 - man/vgrename.8_pregen | 2 - man/vgs.8_pregen | 11 +--- man/vgscan.8_pregen | 2 - man/vgsplit.8_pregen | 2 - 43 files changed, 223 insertions(+), 301 deletions(-) diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen index 05da60f..110dd91 100644 --- a/man/lvchange.8_pregen +++ b/man/lvchange.8_pregen @@ -631,7 +631,6 @@ if the list is set but empty, no LVs match. Autoactivation should be used during system boot to make it possible to select which LVs should be automatically activated by the system. See \fBlvmlockd\fP(8) for more information about activation options \fBey\fP and \fBsy\fP for shared VGs. -See \fBclvmd\fP(8) for more information about activation options \fBey\fP, \fBsy\fP, \fBly\fP and \fBln\fP for clustered VGs. .ad b .HP .ad l @@ -983,12 +982,9 @@ a suitable value automatically. Run the command in a special read-only mode which will read on-disk metadata without needing to take any locks. This can be used to peek inside metadata used by a virtual machine image while the virtual -machine is running. -It can also be used to peek inside the metadata of clustered VGs -when clustered locking is not configured or running. No attempt -will be made to communicate with the device-mapper kernel driver, so -this option is unable to report whether or not LVs are -actually in use. +machine is running. No attempt will be made to communicate with the +device-mapper kernel driver, so this option is unable to report whether +or not LVs are actually in use. .ad b .HP .ad l @@ -1245,11 +1241,9 @@ Change LV permission to read-only: .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen index 635967f..cefdb0d 100644 --- a/man/lvconvert.8_pregen +++ b/man/lvconvert.8_pregen @@ -567,7 +567,7 @@ Convert LV to a thin LV, using the original LV as an external origin. .br - -Convert LV to type cache. +Attach a cache to an LV, converts the LV to type cache. .br .P \fBlvconvert\fP \fB--type\fP \fBcache\fP \fB--cachepool\fP \fILV\fP \fILV\fP\fI_linear_striped_thinpool_raid\fP @@ -626,6 +626,21 @@ Convert LV to type cache. .br - +Attach a writecache to an LV, converts the LV to type writecache. +.br +.P +\fBlvconvert\fP \fB--type\fP \fBwritecache\fP \fB--cachepool\fP \fILV\fP \fILV\fP\fI_linear_striped_raid\fP +.br +.RS 4 +.ad l +[ \fB--cachesettings\fP \fIString\fP ] +.ad b +.br +[ COMMON_OPTIONS ] +.RE +.br +- + Convert LV to type thin-pool. .br .P @@ -765,10 +780,10 @@ Convert LV to type vdopool. .br - -Separate and keep the cache pool from a cache LV. +Detach a cache from an LV. .br .P -\fBlvconvert\fP \fB--splitcache\fP \fILV\fP\fI_thinpool_cache_cachepool\fP +\fBlvconvert\fP \fB--splitcache\fP \fILV\fP\fI_thinpool_cache_cachepool_writecache\fP .br .RS 4 [ COMMON_OPTIONS ] @@ -985,7 +1000,12 @@ See \fBlvm\fP(8) for more information about allocation. .ad b .HP .ad l -\fB-b\fP|\fB--background\fP.ad b +\fB-b\fP|\fB--background\fP +.br +If the operation requires polling, this option causes the command to +return before the operation is complete, and polling is done in the +background. +.ad b .HP .ad l \fB-H\fP|\fB--cache\fP @@ -1668,7 +1688,7 @@ Convert LV to a thin LV, using the original LV as an external origin .br - -Convert LV to type cache (infers --type cache). +Attach a cache to an LV (infers --type cache). .br .P \fBlvconvert\fP \fB-H\fP|\fB--cache\fP \fB--cachepool\fP \fILV\fP \fILV\fP\fI_linear_striped_thinpool_raid\fP @@ -1758,10 +1778,10 @@ Convert LV to type vdopool. .br - -Separate and delete the cache pool from a cache LV. +Detach and delete a cache from an LV. .br .P -\fBlvconvert\fP \fB--uncache\fP \fILV\fP\fI_thinpool_cache\fP +\fBlvconvert\fP \fB--uncache\fP \fILV\fP\fI_thinpool_cache_writecache\fP .br .RS 4 [ COMMON_OPTIONS ] @@ -2019,11 +2039,9 @@ Detach and remove the cache pool from a cache LV. .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen index 7a2adb1..2a5e05d 100644 --- a/man/lvcreate.8_pregen +++ b/man/lvcreate.8_pregen @@ -2099,7 +2099,6 @@ If autoactivation \fBay\fP is used, the LV is only activated if it matches an item in lvm.conf activation/auto_activation_volume_list. \fBay\fP implies --zero n and --wipesignatures n. See \fBlvmlockd\fP(8) for more information about activation options for shared VGs. -See \fBclvmd\fP(8) for more information about activation options for clustered VGs. .ad b .HP .ad l @@ -6177,11 +6176,9 @@ then combining the new origin LV with an existing cache pool. .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen index 9a8962b..4ba8dff 100644 --- a/man/lvdisplay.8_pregen +++ b/man/lvdisplay.8_pregen @@ -368,12 +368,9 @@ Repeat once to also suppress any prompts with answer 'no'. Run the command in a special read-only mode which will read on-disk metadata without needing to take any locks. This can be used to peek inside metadata used by a virtual machine image while the virtual -machine is running. -It can also be used to peek inside the metadata of clustered VGs -when clustered locking is not configured or running. No attempt -will be made to communicate with the device-mapper kernel driver, so -this option is unable to report whether or not LVs are -actually in use. +machine is running. No attempt will be made to communicate with the +device-mapper kernel driver, so this option is unable to report whether +or not LVs are actually in use. .ad b .HP .ad l @@ -563,11 +560,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen index b29f508..6466172 100644 --- a/man/lvextend.8_pregen +++ b/man/lvextend.8_pregen @@ -728,11 +728,9 @@ Extend an LV by 16MiB using specific physical extents. .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen index 111b8ef..1170dc7 100644 --- a/man/lvm-fullreport.8_pregen +++ b/man/lvm-fullreport.8_pregen @@ -339,12 +339,9 @@ Repeat once to also suppress any prompts with answer 'no'. Run the command in a special read-only mode which will read on-disk metadata without needing to take any locks. This can be used to peek inside metadata used by a virtual machine image while the virtual -machine is running. -It can also be used to peek inside the metadata of clustered VGs -when clustered locking is not configured or running. No attempt -will be made to communicate with the device-mapper kernel driver, so -this option is unable to report whether or not LVs are -actually in use. +machine is running. No attempt will be made to communicate with the +device-mapper kernel driver, so this option is unable to report whether +or not LVs are actually in use. .ad b .HP .ad l @@ -538,11 +535,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/lvm-lvpoll.8_pregen b/man/lvm-lvpoll.8_pregen index 1f4c129..d491e77 100644 --- a/man/lvm-lvpoll.8_pregen +++ b/man/lvm-lvpoll.8_pregen @@ -340,11 +340,9 @@ Continue thin snapshot merge. .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/lvmconfig.8_pregen b/man/lvmconfig.8_pregen index 0db2dd7..7f8e6c6 100644 --- a/man/lvmconfig.8_pregen +++ b/man/lvmconfig.8_pregen @@ -532,11 +532,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/lvmdiskscan.8_pregen b/man/lvmdiskscan.8_pregen index 8eb57bf..91a4567 100644 --- a/man/lvmdiskscan.8_pregen +++ b/man/lvmdiskscan.8_pregen @@ -173,12 +173,9 @@ Repeat once to also suppress any prompts with answer 'no'. Run the command in a special read-only mode which will read on-disk metadata without needing to take any locks. This can be used to peek inside metadata used by a virtual machine image while the virtual -machine is running. -It can also be used to peek inside the metadata of clustered VGs -when clustered locking is not configured or running. No attempt -will be made to communicate with the device-mapper kernel driver, so -this option is unable to report whether or not LVs are -actually in use. +machine is running. No attempt will be made to communicate with the +device-mapper kernel driver, so this option is unable to report whether +or not LVs are actually in use. .ad b .HP .ad l @@ -287,11 +284,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen index 7acc042..450ae80 100644 --- a/man/lvreduce.8_pregen +++ b/man/lvreduce.8_pregen @@ -391,11 +391,9 @@ Reduce the size of an LV by 3 logical extents: .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/lvremove.8_pregen b/man/lvremove.8_pregen index c835672..7798e13 100644 --- a/man/lvremove.8_pregen +++ b/man/lvremove.8_pregen @@ -385,11 +385,9 @@ Remove all LVs the specified VG. .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/lvrename.8_pregen b/man/lvrename.8_pregen index 8d2f9b3..811f5a0 100644 --- a/man/lvrename.8_pregen +++ b/man/lvrename.8_pregen @@ -322,11 +322,9 @@ An alternate syntax to rename "lvold" to "lvnew": .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen index 13246f5..e3a124a 100644 --- a/man/lvresize.8_pregen +++ b/man/lvresize.8_pregen @@ -654,11 +654,9 @@ Extend an LV by 16MB using specific physical extents: .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen index fecca99..cbc0ed8 100644 --- a/man/lvs.8_pregen +++ b/man/lvs.8_pregen @@ -354,12 +354,9 @@ Repeat once to also suppress any prompts with answer 'no'. Run the command in a special read-only mode which will read on-disk metadata without needing to take any locks. This can be used to peek inside metadata used by a virtual machine image while the virtual -machine is running. -It can also be used to peek inside the metadata of clustered VGs -when clustered locking is not configured or running. No attempt -will be made to communicate with the device-mapper kernel driver, so -this option is unable to report whether or not LVs are -actually in use. +machine is running. No attempt will be made to communicate with the +device-mapper kernel driver, so this option is unable to report whether +or not LVs are actually in use. .ad b .HP .ad l @@ -644,11 +641,9 @@ s(k)ip activation: this volume is flagged to be skipped during activation. .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/lvscan.8_pregen b/man/lvscan.8_pregen index 2d4fd6b..af11427 100644 --- a/man/lvscan.8_pregen +++ b/man/lvscan.8_pregen @@ -198,12 +198,9 @@ Repeat once to also suppress any prompts with answer 'no'. Run the command in a special read-only mode which will read on-disk metadata without needing to take any locks. This can be used to peek inside metadata used by a virtual machine image while the virtual -machine is running. -It can also be used to peek inside the metadata of clustered VGs -when clustered locking is not configured or running. No attempt -will be made to communicate with the device-mapper kernel driver, so -this option is unable to report whether or not LVs are -actually in use. +machine is running. No attempt will be made to communicate with the +device-mapper kernel driver, so this option is unable to report whether +or not LVs are actually in use. .ad b .HP .ad l @@ -323,11 +320,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen index 8c9288d..c21ce70 100644 --- a/man/pvchange.8_pregen +++ b/man/pvchange.8_pregen @@ -439,11 +439,9 @@ disk errors, or because it will be removed after freeing it). .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/pvck.8_pregen b/man/pvck.8_pregen index 499f62c..5277418 100644 --- a/man/pvck.8_pregen +++ b/man/pvck.8_pregen @@ -284,11 +284,9 @@ parameter with a value of 204800 (100 * 1024 * 1024 / 512 = 204800). .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/pvcreate.8_pregen b/man/pvcreate.8_pregen index 2b4fb1c..aa893f4 100644 --- a/man/pvcreate.8_pregen +++ b/man/pvcreate.8_pregen @@ -8,27 +8,84 @@ pvcreate - Initialize physical volume(s) for use by LVM [ \fIoption_args\fP ] .br .SH DESCRIPTION -pvcreate initializes a PV so that it is recognized as belonging to LVM, -and allows the PV to be used in a VG. A PV can be a disk partition, whole -disk, meta device, or loopback file. - -For DOS disk partitions, the partition id should be set to 0x8e using -.BR fdisk (8), -.BR cfdisk (8), -or a equivalent. For GUID Partition Table (GPT), the id is -E6D6D379-F507-44C2-A23C-238F2A3DF928. For -whole disk devices only -the partition table must be erased, which will effectively destroy all -data on that disk. This can be done by zeroing the first sector with: - -.BI "dd if=/dev/zero of=" PhysicalVolume " bs=512 count=1" +pvcreate initializes a Physical Volume (PV) on a device so the device is +recognized as belonging to LVM. This allows the PV to be used in a Volume +Group (VG). An LVM disk label is written to the device, and LVM metadata +areas are initialized. A PV can be placed on a whole device or partition. Use \fBvgcreate\fP(8) to create a new VG on the PV, or \fBvgextend\fP(8) -to add the PV to existing VG. +to add the PV to an existing VG. Use \fBpvremove\fP(8) to remove the LVM +disk label from the device. The force option will create a PV without confirmation. Repeating the force option (\fB-ff\fP) will forcibly create a PV, overriding checks that normally prevent it, e.g. if the PV is already in a VG. + +.B Metadata location, size, and alignment + +The LVM disk label begins 512 bytes from the start of the device, and is +512 bytes in size. + +The LVM metadata area begins at an offset (from the start of the device) +equal to the page size of the machine creating the PV (often 4 KiB.) The +metadata area contains a 512 byte header and a multi-KiB circular buffer +that holds text copies of the VG metadata. + +With default settings, the first physical extent (PE), which contains LV +data, is 1 MiB from the start of the device. This location is controlled +by \fBdefault_data_alignment\fP in lvm.conf, which is set to 1 (MiB) by +default. The pe_start will be a multiple of this many MiB. This location +can be checked with: +.br +.B pvs -o pe_start +.I PV + +The size of the LVM metadata area is the space between the the start of +the metadata area and the first PE. When metadata begins at 4 KiB and the +first PE is at 1024 KiB, the metadata area size is 1020 KiB. This can be +checked with: +.br +.B pvs -o mda_size +.I PV + +The mda_size cannot be increased after pvcreate, so if larger metadata is +needed, it must be set during pvcreate. Two copies of the VG metadata +must always fit within the metadata area, so the maximum VG metadata size +is around half the mda_size. This can be checked with: +.br +.B vgs -o mda_free +.I VG + +A larger metadata area can be set with --metadatasize. The resulting +mda_size may be larger than specified due to default_data_alignment +placing pe_start on a MiB boundary, and the fact that the metadata area +extends to the first PE. With metadata starting at 4 KiB and +default_data_alignment 1 (MiB), setting --metadatasize 2048k results in +pe_start of 3 MiB and mda_size of 3068 KiB. Alternatively, --metadatasize +2044k results in pe_start at 2 MiB and mda_size of 2044 KiB. + +The alignment of pe_start described above may be automatically overriden +based on md device properties or device i/o properties reported in sysfs. +These automatic adjustments can be enabled/disabled using lvm.conf +settings md_chunk_alignment and data_alignment_offset_detection. + +To use a different pe_start alignment, use the --dataalignment option. +The --metadatasize option would also typically be used in this case +because the metadata area size also determines the location of pe_start. +When using these two options together, pe_start is calculated as: +metadata area start (page size), plus the specified --metadatasize, +rounded up to the next multiple of --dataalignment. +With metadata starting at 4 KiB, --metadatasize 2048k, and --dataalignment 128k, +pe_start is 2176 KiB and mda_size is 2172 KiB. +The pe_start of 2176 KiB is the nearest even multiple of 128 KiB that +provides at least 2048 KiB of metadata space. +Always check the resulting alignment and metadata size when using +these options. + +To shift an aligned pe_start value, use the --dataaligmentoffset option. +The pe_start alignment is calculated as described above, and then the +value specified with --dataaligmentoffset is added to produce the final +pe_start value. .SH USAGE \fBpvcreate\fP \fIPV\fP ... .br @@ -161,14 +218,16 @@ Common options for lvm: .ad l \fB--bootloaderareasize\fP \fISize\fP[m|UNIT] .br -Create a separate bootloader area of specified size besides PV's data -area. The bootloader area is an area of reserved space on the PV from -which LVM will not allocate any extents and it's kept untouched. This is -primarily aimed for use with bootloaders to embed their own data or metadata. +Reserve space for the bootloader between the LVM metadata area and the first PE. +The bootloader area is reserved for bootloaders to embed their own data or +metadata; LVM will not use it. +The bootloader area begins where the first PE would otherwise be located. +The first PE is moved out by the size of the bootloader area, and then moved +out further if necessary to match the data alignment. The start of the bootloader area is always aligned, see also --dataalignment -and --dataalignmentoffset. The bootloader area size may eventually -end up increased due to the alignment, but it's never less than the -size that is requested. To see the bootloader area start and size of +and --dataalignmentoffset. The bootloader area may be larger than requested +due to the alignment, but it's never less than the requested size. +To see the bootloader area start and size of an existing PV use pvs -o +pv_ba_start,pv_ba_size. .ad b .HP @@ -191,17 +250,17 @@ See \fBlvm.conf\fP(5) for more information about config. .ad l \fB--dataalignment\fP \fISize\fP[k|UNIT] .br -Align the start of the data to a multiple of this number. -Also specify an appropriate Physical Extent size when creating a VG. -To see the location of the first Physical Extent of an existing PV, -use pvs -o +pe_start. In addition, it may be shifted by an alignment offset. -See lvm.conf/data_alignment_offset_detection and --dataalignmentoffset. +Align the start of a PV data area with a multiple of this number. +To see the location of the first Physical Extent (PE) of an existing PV, +use pvs -o +pe_start. In addition, it may be shifted by an alignment offset, +see --dataalignmentoffset. +Also specify an appropriate PE size when creating a VG. .ad b .HP .ad l \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT] .br -Shift the start of the data area by this additional offset. +Shift the start of the PV data area by this additional offset. .ad b .HP .ad l @@ -303,8 +362,7 @@ on the command. The number of metadata areas to set aside on a PV for storing VG metadata. When 2, one copy of the VG metadata is stored at the front of the PV and a second copy is stored at the end. -When 1, one copy of the VG metadata is stored at the front of the PV -(starting in the 5th sector). +When 1, one copy of the VG metadata is stored at the front of the PV. When 0, no copies of the VG metadata are stored on the given PV. This may be useful in VGs containing many PVs (this places limitations on the ability to use vgsplit later.) @@ -496,11 +554,9 @@ boundary) manually account for this when initializing for use by LVM. .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen index 9dbcac3..ef225cf 100644 --- a/man/pvdisplay.8_pregen +++ b/man/pvdisplay.8_pregen @@ -353,12 +353,9 @@ Repeat once to also suppress any prompts with answer 'no'. Run the command in a special read-only mode which will read on-disk metadata without needing to take any locks. This can be used to peek inside metadata used by a virtual machine image while the virtual -machine is running. -It can also be used to peek inside the metadata of clustered VGs -when clustered locking is not configured or running. No attempt -will be made to communicate with the device-mapper kernel driver, so -this option is unable to report whether or not LVs are -actually in use. +machine is running. No attempt will be made to communicate with the +device-mapper kernel driver, so this option is unable to report whether +or not LVs are actually in use. .ad b .HP .ad l @@ -550,11 +547,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/pvmove.8_pregen b/man/pvmove.8_pregen index 16bbe94..e8413cb 100644 --- a/man/pvmove.8_pregen +++ b/man/pvmove.8_pregen @@ -195,7 +195,12 @@ Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information .ad b .HP .ad l -\fB-b\fP|\fB--background\fP.ad b +\fB-b\fP|\fB--background\fP +.br +If the operation requires polling, this option causes the command to +return before the operation is complete, and polling is done in the +background. +.ad b .HP .ad l \fB--commandprofile\fP \fIString\fP @@ -505,11 +510,9 @@ extents can also be picked out and moved. .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/pvremove.8_pregen b/man/pvremove.8_pregen index 3d83478..89f8c0d 100644 --- a/man/pvremove.8_pregen +++ b/man/pvremove.8_pregen @@ -295,11 +295,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/pvresize.8_pregen b/man/pvresize.8_pregen index 5a5c975..53ed2fd 100644 --- a/man/pvresize.8_pregen +++ b/man/pvresize.8_pregen @@ -302,11 +302,9 @@ appropriate for the intended new partition size). .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen index 53c259c..1902f29 100644 --- a/man/pvs.8_pregen +++ b/man/pvs.8_pregen @@ -341,12 +341,9 @@ Repeat once to also suppress any prompts with answer 'no'. Run the command in a special read-only mode which will read on-disk metadata without needing to take any locks. This can be used to peek inside metadata used by a virtual machine image while the virtual -machine is running. -It can also be used to peek inside the metadata of clustered VGs -when clustered locking is not configured or running. No attempt -will be made to communicate with the device-mapper kernel driver, so -this option is unable to report whether or not LVs are -actually in use. +machine is running. No attempt will be made to communicate with the +device-mapper kernel driver, so this option is unable to report whether +or not LVs are actually in use. .ad b .HP .ad l @@ -568,11 +565,9 @@ e(x)ported .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen index 2326ec5..ed5ba92 100644 --- a/man/pvscan.8_pregen +++ b/man/pvscan.8_pregen @@ -10,73 +10,50 @@ pvscan - List all physical volumes [ \fIposition_args\fP ] .br .SH DESCRIPTION -pvscan scans all supported LVM block devices in the system for PVs. +When called without the --cache option, pvscan lists PVs on the system, +like +.BR pvs (8) +or +.BR pvdisplay (8). + +When the --cache and -aay options are used, pvscan records which PVs are +available on the system, and activates LVs in completed VGs. A VG is +complete when pvscan sees that the final PV in the VG has appeared. This +is used by event-based system startup (systemd, udev) to activate LVs. + +The four main variations of this are: + +.B pvscan --cache +.IR device -\fBScanning with lvmetad\fP +If device is present, lvm adds a record that the PV on device is online. +If device is not present, lvm removes the online record for the PV. +In most cases, the pvscan will only read the named devices. -pvscan operates differently when used with the -.BR lvmetad (8) -daemon. +.B pvscan --cache -aay +.IR device ... -Scanning disks is required to read LVM metadata and identify LVM PVs. -Once read, lvmetad caches the metadata so that LVM commands can read it -without repeatedly scanning disks. This is helpful because scanning disks -is time consuming, and frequent scanning may interfere with the normal -work of the system and disks. +This begins by performing the same steps as above. Afterward, if the VG +for the specified PV is complete, then pvscan will activate LVs in the VG +(the same as vgchange -aay vgname would do.) -When lvmetad is not used, LVM commands revert to scanning disks to read -metadata. Any LVM command that needs metadata will scan disks for it; -running the pvscan command is not necessary for the sake of other LVM -commands. +.B pvscan --cache -When lvmetad is used, LVM commands avoid scanning disks by reading -metadata from lvmetad. When new disks appear, they must be scanned so -their metadata can be cached in lvmetad. This is done by the command -pvscan --cache, which scans disks and passes the metadata to lvmetad. +This first clears all existing PV online records, then scans all devices +on the system, adding PV online records for any PVs that are found. -The pvscan --cache command is typically run automatically by system -services when a new device appears. Users do not generally need to run -this command if the system and lvmetad are running properly. +.B pvscan --cache -aay + +This begins by performing the same steps as pvscan --cache. Afterward, it +activates LVs in any complete VGs. -Many scripts contain unnecessary pvscan (or vgscan) commands for -historical reasons. To avoid disrupting the system with extraneous disk -scanning, an ordinary pvscan (without --cache) will simply read metadata -from lvmetad like other LVM commands. It does not do anything beyond -displaying the current state of the cache. -.IP \[bu] 2 -When given specific device name arguments, pvscan --cache will only -read the named devices. -.IP \[bu] 2 -LVM udev rules and systemd services are used to initiate automatic device -scanning. -.IP \[bu] 2 To prevent devices from being scanned by pvscan --cache, add them to .BR lvm.conf (5) .B devices/global_filter. -The devices/filter setting does not -apply to system level scanning. For more information, see: .br .B lvmconfig --withcomments devices/global_filter -.IP \[bu] 2 -If lvmetad is started or restarted after devices are visible, or -if the global_filter has changed, then all devices must be rescanned -for metadata with the command pvscan --cache. -.IP \[bu] 2 -lvmetad does not cache older metadata formats, e.g. lvm1, and will -be temporarily disabled if they are seen. -.IP \[bu] 2 -To notify lvmetad about a device that is no longer present, the major and -minor numbers must be given, not the path. -.P -\fBAutomatic activation\fP - -When event-driven system services detect a new LVM device, the first step -is to automatically scan and cache the metadata from the device. This is -done by pvscan --cache. A second step is to automatically activate LVs -that are present on the new device. This auto-activation is done by the -same pvscan --cache command when the option --activate ay is included. Auto-activation of VGs or LVs can be enabled/disabled using: .br @@ -87,21 +64,12 @@ For more information, see: .br .B lvmconfig --withcomments activation/auto_activation_volume_list -When this setting is undefined, all LVs are auto-activated (when lvm is -fully integrated with the event-driven system services.) +To disable auto-activation, explicitly set this list to an empty list, +i.e. auto_activation_volume_list = [ ]. + +When this setting is undefined (e.g. commented), then all LVs are +auto-activated. -When a VG or LV is not auto-activated, traditional activation using -vgchange or lvchange --activate is needed. -.IP \[bu] 2 -pvscan auto-activation can be only done in combination with --cache. -.IP \[bu] 2 -Auto-activation is designated by the "a" argument in --activate ay. -This is meant to distinguish system generated commands from explicit user -commands, although it can be used in any activation command. Whenever it -is used, the auto_activation_volume_list is applied. -.IP \[bu] 2 -Auto-activation is not yet supported for LVs that are part of partial or -clustered volume groups. .SH USAGE Display PV information. .br @@ -136,10 +104,6 @@ Autoactivate a VG when all PVs are online. .br .RS 4 .ad l -[ \fB-b\fP|\fB--background\fP ] -.ad b -.br -.ad l [ \fB-a\fP|\fB--activate\fP \fBay\fP ] .ad b .br @@ -239,9 +203,6 @@ Auto-activate LVs in a VG when the PVs scanned have completed the VG. .ad b .HP .ad l -\fB-b\fP|\fB--background\fP.ad b -.HP -.ad l \fB--cache\fP .br Scan one or more devices and record that they are online. @@ -486,11 +447,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgcfgbackup.8_pregen b/man/vgcfgbackup.8_pregen index cd2521a..73a0868 100644 --- a/man/vgcfgbackup.8_pregen +++ b/man/vgcfgbackup.8_pregen @@ -215,12 +215,9 @@ Repeat once to also suppress any prompts with answer 'no'. Run the command in a special read-only mode which will read on-disk metadata without needing to take any locks. This can be used to peek inside metadata used by a virtual machine image while the virtual -machine is running. -It can also be used to peek inside the metadata of clustered VGs -when clustered locking is not configured or running. No attempt -will be made to communicate with the device-mapper kernel driver, so -this option is unable to report whether or not LVs are -actually in use. +machine is running. No attempt will be made to communicate with the +device-mapper kernel driver, so this option is unable to report whether +or not LVs are actually in use. .ad b .HP .ad l @@ -344,11 +341,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgcfgrestore.8_pregen b/man/vgcfgrestore.8_pregen index b4e2183..71d2ada 100644 --- a/man/vgcfgrestore.8_pregen +++ b/man/vgcfgrestore.8_pregen @@ -434,11 +434,9 @@ missing PV. Repeat for all other missing PVs in the VG. Then use .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen index e1fcb81..10cf8a7 100644 --- a/man/vgchange.8_pregen +++ b/man/vgchange.8_pregen @@ -652,7 +652,6 @@ if the list is set but empty, no LVs match. Autoactivation should be used during system boot to make it possible to select which LVs should be automatically activated by the system. See \fBlvmlockd\fP(8) for more information about activation options \fBey\fP and \fBsy\fP for shared VGs. -See \fBclvmd\fP(8) for more information about activation options \fBey\fP, \fBsy\fP, \fBly\fP and \fBln\fP for clustered VGs. .ad b .HP .ad l @@ -913,8 +912,7 @@ on the command. The number of metadata areas to set aside on a PV for storing VG metadata. When 2, one copy of the VG metadata is stored at the front of the PV and a second copy is stored at the end. -When 1, one copy of the VG metadata is stored at the front of the PV -(starting in the 5th sector). +When 1, one copy of the VG metadata is stored at the front of the PV. When 0, no copies of the VG metadata are stored on the given PV. This may be useful in VGs containing many PVs (this places limitations on the ability to use vgsplit later.) @@ -933,12 +931,9 @@ Repeat once to also suppress any prompts with answer 'no'. Run the command in a special read-only mode which will read on-disk metadata without needing to take any locks. This can be used to peek inside metadata used by a virtual machine image while the virtual -machine is running. -It can also be used to peek inside the metadata of clustered VGs -when clustered locking is not configured or running. No attempt -will be made to communicate with the device-mapper kernel driver, so -this option is unable to report whether or not LVs are -actually in use. +machine is running. No attempt will be made to communicate with the +device-mapper kernel driver, so this option is unable to report whether +or not LVs are actually in use. .ad b .HP .ad l @@ -1159,11 +1154,9 @@ Change the maximum number of LVs for an inactive VG. .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgck.8_pregen b/man/vgck.8_pregen index b1418f3..4f2a866 100644 --- a/man/vgck.8_pregen +++ b/man/vgck.8_pregen @@ -282,11 +282,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen index b2a6027..48cf5e5 100644 --- a/man/vgconvert.8_pregen +++ b/man/vgconvert.8_pregen @@ -111,14 +111,16 @@ Common options for lvm: .ad l \fB--bootloaderareasize\fP \fISize\fP[m|UNIT] .br -Create a separate bootloader area of specified size besides PV's data -area. The bootloader area is an area of reserved space on the PV from -which LVM will not allocate any extents and it's kept untouched. This is -primarily aimed for use with bootloaders to embed their own data or metadata. +Reserve space for the bootloader between the LVM metadata area and the first PE. +The bootloader area is reserved for bootloaders to embed their own data or +metadata; LVM will not use it. +The bootloader area begins where the first PE would otherwise be located. +The first PE is moved out by the size of the bootloader area, and then moved +out further if necessary to match the data alignment. The start of the bootloader area is always aligned, see also --dataalignment -and --dataalignmentoffset. The bootloader area size may eventually -end up increased due to the alignment, but it's never less than the -size that is requested. To see the bootloader area start and size of +and --dataalignmentoffset. The bootloader area may be larger than requested +due to the alignment, but it's never less than the requested size. +To see the bootloader area start and size of an existing PV use pvs -o +pv_ba_start,pv_ba_size. .ad b .HP @@ -221,8 +223,7 @@ on the command. The number of metadata areas to set aside on a PV for storing VG metadata. When 2, one copy of the VG metadata is stored at the front of the PV and a second copy is stored at the end. -When 1, one copy of the VG metadata is stored at the front of the PV -(starting in the 5th sector). +When 1, one copy of the VG metadata is stored at the front of the PV. When 0, no copies of the VG metadata are stored on the given PV. This may be useful in VGs containing many PVs (this places limitations on the ability to use vgsplit later.) @@ -357,11 +358,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgcreate.8_pregen b/man/vgcreate.8_pregen index cc990cc..d8ebc2a 100644 --- a/man/vgcreate.8_pregen +++ b/man/vgcreate.8_pregen @@ -12,6 +12,12 @@ vgcreate creates a new VG on block devices. If the devices were not previously intialized as PVs with \fBpvcreate\fP(8), vgcreate will inititialize them, making them PVs. The pvcreate options for initializing devices are also available with vgcreate. + +When vgcreate uses an existing PV, that PV's existing values for metadata +size, PE start, etc, are used, even if different values are specified in +the vgcreate command. To change these values, first use pvremove on the +device. + .SH USAGE \fBvgcreate\fP \fIVG\fP\fI_new\fP \fIPV\fP ... .br @@ -226,17 +232,17 @@ See \fBlvm.conf\fP(5) for more information about config. .ad l \fB--dataalignment\fP \fISize\fP[k|UNIT] .br -Align the start of the data to a multiple of this number. -Also specify an appropriate Physical Extent size when creating a VG. -To see the location of the first Physical Extent of an existing PV, -use pvs -o +pe_start. In addition, it may be shifted by an alignment offset. -See lvm.conf/data_alignment_offset_detection and --dataalignmentoffset. +Align the start of a PV data area with a multiple of this number. +To see the location of the first Physical Extent (PE) of an existing PV, +use pvs -o +pe_start. In addition, it may be shifted by an alignment offset, +see --dataalignmentoffset. +Also specify an appropriate PE size when creating a VG. .ad b .HP .ad l \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT] .br -Shift the start of the data area by this additional offset. +Shift the start of the PV data area by this additional offset. .ad b .HP .ad l @@ -362,8 +368,7 @@ on the command. The number of metadata areas to set aside on a PV for storing VG metadata. When 2, one copy of the VG metadata is stored at the front of the PV and a second copy is stored at the end. -When 1, one copy of the VG metadata is stored at the front of the PV -(starting in the 5th sector). +When 1, one copy of the VG metadata is stored at the front of the PV. When 0, no copies of the VG metadata are stored on the given PV. This may be useful in VGs containing many PVs (this places limitations on the ability to use vgsplit later.) @@ -394,7 +399,6 @@ Create a shared VG using lvmlockd if LVM is compiled with lockd support. lvmlockd will select lock type sanlock or dlm depending on which lock manager is running. This allows multiple hosts to share a VG on shared devices. lvmlockd and a lock manager must be configured and running. -(A shared VG using lvmlockd is different from a clustered VG using clvmd.) See \fBlvmlockd\fP(8) for more information about shared VGs. .ad b .HP @@ -561,11 +565,9 @@ Create a VG with two PVs, using the default physical extent size. .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen index 7c8fb12..e65a53a 100644 --- a/man/vgdisplay.8_pregen +++ b/man/vgdisplay.8_pregen @@ -342,12 +342,9 @@ Repeat once to also suppress any prompts with answer 'no'. Run the command in a special read-only mode which will read on-disk metadata without needing to take any locks. This can be used to peek inside metadata used by a virtual machine image while the virtual -machine is running. -It can also be used to peek inside the metadata of clustered VGs -when clustered locking is not configured or running. No attempt -will be made to communicate with the device-mapper kernel driver, so -this option is unable to report whether or not LVs are -actually in use. +machine is running. No attempt will be made to communicate with the +device-mapper kernel driver, so this option is unable to report whether +or not LVs are actually in use. .ad b .HP .ad l @@ -533,11 +530,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgexport.8_pregen b/man/vgexport.8_pregen index a87c871..5018efd 100644 --- a/man/vgexport.8_pregen +++ b/man/vgexport.8_pregen @@ -340,11 +340,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgextend.8_pregen b/man/vgextend.8_pregen index a2aff35..d2b4f7e 100644 --- a/man/vgextend.8_pregen +++ b/man/vgextend.8_pregen @@ -162,17 +162,17 @@ See \fBlvm.conf\fP(5) for more information about config. .ad l \fB--dataalignment\fP \fISize\fP[k|UNIT] .br -Align the start of the data to a multiple of this number. -Also specify an appropriate Physical Extent size when creating a VG. -To see the location of the first Physical Extent of an existing PV, -use pvs -o +pe_start. In addition, it may be shifted by an alignment offset. -See lvm.conf/data_alignment_offset_detection and --dataalignmentoffset. +Align the start of a PV data area with a multiple of this number. +To see the location of the first Physical Extent (PE) of an existing PV, +use pvs -o +pe_start. In addition, it may be shifted by an alignment offset, +see --dataalignmentoffset. +Also specify an appropriate PE size when creating a VG. .ad b .HP .ad l \fB--dataalignmentoffset\fP \fISize\fP[k|UNIT] .br -Shift the start of the data area by this additional offset. +Shift the start of the PV data area by this additional offset. .ad b .HP .ad l @@ -267,8 +267,7 @@ on the command. The number of metadata areas to set aside on a PV for storing VG metadata. When 2, one copy of the VG metadata is stored at the front of the PV and a second copy is stored at the end. -When 1, one copy of the VG metadata is stored at the front of the PV -(starting in the 5th sector). +When 1, one copy of the VG metadata is stored at the front of the PV. When 0, no copies of the VG metadata are stored on the given PV. This may be useful in VGs containing many PVs (this places limitations on the ability to use vgsplit later.) @@ -432,11 +431,9 @@ Add two PVs to a VG. .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgimport.8_pregen b/man/vgimport.8_pregen index f3d86df..03b7bdc 100644 --- a/man/vgimport.8_pregen +++ b/man/vgimport.8_pregen @@ -338,11 +338,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgimportclone.8_pregen b/man/vgimportclone.8_pregen index 0d0eb84..11b8e7c 100644 --- a/man/vgimportclone.8_pregen +++ b/man/vgimportclone.8_pregen @@ -301,11 +301,9 @@ Rename the VG associated with "/dev/sdc" and "/dev/sdd" from "vg00" to "vg00_sna .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgmerge.8_pregen b/man/vgmerge.8_pregen index 8b599f8..b964e3a 100644 --- a/man/vgmerge.8_pregen +++ b/man/vgmerge.8_pregen @@ -286,11 +286,9 @@ Merge an inactive VG named "vg00" into the active or inactive VG named .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgmknodes.8_pregen b/man/vgmknodes.8_pregen index 1cff786..199e7eb 100644 --- a/man/vgmknodes.8_pregen +++ b/man/vgmknodes.8_pregen @@ -315,11 +315,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgreduce.8_pregen b/man/vgreduce.8_pregen index fd92266..7aed4d8 100644 --- a/man/vgreduce.8_pregen +++ b/man/vgreduce.8_pregen @@ -445,11 +445,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgremove.8_pregen b/man/vgremove.8_pregen index 69f2831..703f3ba 100644 --- a/man/vgremove.8_pregen +++ b/man/vgremove.8_pregen @@ -332,11 +332,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgrename.8_pregen b/man/vgrename.8_pregen index 0313cf8..8085e06 100644 --- a/man/vgrename.8_pregen +++ b/man/vgrename.8_pregen @@ -328,11 +328,9 @@ Rename the VG with the specified UUID to "myvg". .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen index c8a9611..7ba7b8c 100644 --- a/man/vgs.8_pregen +++ b/man/vgs.8_pregen @@ -336,12 +336,9 @@ Repeat once to also suppress any prompts with answer 'no'. Run the command in a special read-only mode which will read on-disk metadata without needing to take any locks. This can be used to peek inside metadata used by a virtual machine image while the virtual -machine is running. -It can also be used to peek inside the metadata of clustered VGs -when clustered locking is not configured or running. No attempt -will be made to communicate with the device-mapper kernel driver, so -this option is unable to report whether or not LVs are -actually in use. +machine is running. No attempt will be made to communicate with the +device-mapper kernel driver, so this option is unable to report whether +or not LVs are actually in use. .ad b .HP .ad l @@ -556,11 +553,9 @@ Allocation policy: (c)ontiguous, c(l)ing, (n)ormal, (a)nywhere .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgscan.8_pregen b/man/vgscan.8_pregen index 7fe3713..68050c9 100644 --- a/man/vgscan.8_pregen +++ b/man/vgscan.8_pregen @@ -302,11 +302,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8) diff --git a/man/vgsplit.8_pregen b/man/vgsplit.8_pregen index c1e7f4e..f76a4db 100644 --- a/man/vgsplit.8_pregen +++ b/man/vgsplit.8_pregen @@ -395,11 +395,9 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete .BR lvmdump (8) .BR dmeventd (8) -.BR lvmetad (8) .BR lvmpolld (8) .BR lvmlockd (8) .BR lvmlockctl (8) -.BR clvmd (8) .BR cmirrord (8) .BR lvmdbusd (8)

5 years, 4 months

1
0
0 / 0

master - make: generate config update

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=fc482406ec4e0607a9d... Commit: fc482406ec4e0607a9d7335ac927c64b361cad1c Parent: 4ddd756d6f0729d5f339b0165745cbf61d4ca931 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Nov 29 23:08:05 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Nov 29 23:10:08 2018 +0100 make: generate config update --- conf/example.conf.in | 126 +++++++++++++++++++------------------------------- 1 files changed, 47 insertions(+), 79 deletions(-) diff --git a/conf/example.conf.in b/conf/example.conf.in index 2690006..0204f4b 100644 --- a/conf/example.conf.in +++ b/conf/example.conf.in @@ -149,18 +149,6 @@ devices { # This configuration option has an automatic default value. # global_filter = [ "a|.*/|" ] - # Configuration option devices/cache_dir. - # This setting is no longer used. - cache_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_CACHE_SUBDIR@" - - # Configuration option devices/cache_file_prefix. - # This setting is no longer used. - cache_file_prefix = "" - - # Configuration option devices/write_cache_state. - # This setting is no longer used. - write_cache_state = 1 - # Configuration option devices/types. # List of additional acceptable block device types. # These are of device type names from /proc/devices, followed by the @@ -197,19 +185,24 @@ devices { fw_raid_component_detection = 0 # Configuration option devices/md_chunk_alignment. - # Align PV data blocks with md device's stripe-width. + # Align the start of a PV data area with md device's stripe-width. # This applies if a PV is placed directly on an md device. + # default_data_alignment will be overriden if it is not aligned + # with the value detected for this setting. + # This setting is overriden by data_alignment_detection, + # data_alignment, and the --dataalignment option. md_chunk_alignment = 1 # Configuration option devices/default_data_alignment. - # Default alignment of the start of a PV data area in MB. - # If set to 0, a value of 64KiB will be used. - # Set to 1 for 1MiB, 2 for 2MiB, etc. + # Align the start of a PV data area with this number of MiB. + # Set to 1 for 1MiB, 2 for 2MiB, etc. Set to 0 to disable. + # This setting is overriden by data_alignment and the --dataalignment + # option. # This configuration option has an automatic default value. # default_data_alignment = 1 # Configuration option devices/data_alignment_detection. - # Detect PV data alignment based on sysfs device information. + # Align the start of a PV data area with sysfs io properties. # The start of a PV data area will be a multiple of minimum_io_size or # optimal_io_size exposed in sysfs. minimum_io_size is the smallest # request the device can perform without incurring a read-modify-write @@ -217,27 +210,29 @@ devices { # preferred unit of receiving I/O, e.g. MD stripe width. # minimum_io_size is used if optimal_io_size is undefined (0). # If md_chunk_alignment is enabled, that detects the optimal_io_size. - # This setting takes precedence over md_chunk_alignment. + # default_data_alignment and md_chunk_alignment will be overriden + # if they are not aligned with the value detected for this setting. + # This setting is overriden by data_alignment and the --dataalignment + # option. data_alignment_detection = 1 # Configuration option devices/data_alignment. - # Alignment of the start of a PV data area in KiB. - # If a PV is placed directly on an md device and md_chunk_alignment or - # data_alignment_detection are enabled, then this setting is ignored. - # Otherwise, md_chunk_alignment and data_alignment_detection are - # disabled if this is set. Set to 0 to use the default alignment or the - # page size, if larger. + # Align the start of a PV data area with this number of KiB. + # When non-zero, this setting overrides default_data_alignment. + # Set to 0 to disable, in which case default_data_alignment + # is used to align the first PE in units of MiB. + # This setting is overriden by the --dataalignment option. data_alignment = 0 # Configuration option devices/data_alignment_offset_detection. - # Detect PV data alignment offset based on sysfs device information. - # The start of a PV aligned data area will be shifted by the + # Shift the start of an aligned PV data area based on sysfs information. + # After a PV data area is aligned, it will be shifted by the # alignment_offset exposed in sysfs. This offset is often 0, but may # be non-zero. Certain 4KiB sector drives that compensate for windows # partitioning will have an alignment_offset of 3584 bytes (sector 7 # is the lowest aligned logical block, the 4KiB sectors start at # LBA -1, and consequently sector 63 is aligned on a 4KiB boundary). - # pvcreate --dataalignmentoffset will skip this detection. + # This setting is overriden by the --dataalignmentoffset option. data_alignment_offset_detection = 1 # Configuration option devices/ignore_suspended_devices. @@ -265,10 +260,6 @@ devices { # different way, making them a better choice for VG stacking. ignore_lvm_mirrors = 1 - # Configuration option devices/disable_after_error_count. - # This setting is no longer used. - disable_after_error_count = 0 - # Configuration option devices/require_restorefile_with_uuid. # Allow use of pvcreate --uuid without requiring --restorefile. require_restorefile_with_uuid = 1 @@ -837,20 +828,6 @@ global { # the error messages. activation = 1 - # Configuration option global/fallback_to_lvm1. - # This setting is no longer used. - # This configuration option has an automatic default value. - # fallback_to_lvm1 = 0 - - # Configuration option global/format. - # This setting is no longer used. - # This configuration option has an automatic default value. - # format = "lvm2" - - # Configuration option global/format_libraries. - # This setting is no longer used. - # This configuration option does not have a default value defined. - # Configuration option global/segment_libraries. # This configuration option does not have a default value defined. @@ -863,22 +840,10 @@ global { # Location of /etc system configuration directory. etc = "@CONFDIR@" - # Configuration option global/locking_type. - # This setting is no longer used. - locking_type = 1 - # Configuration option global/wait_for_locks. # When disabled, fail if a lock request would block. wait_for_locks = 1 - # Configuration option global/fallback_to_clustered_locking. - # This setting is no longer used. - fallback_to_clustered_locking = 1 - - # Configuration option global/fallback_to_local_locking. - # This setting is no longer used. - fallback_to_local_locking = 1 - # Configuration option global/locking_dir. # Directory to use for LVM command file locks. # Local non-LV directory that holds file-based locks while commands are @@ -899,11 +864,6 @@ global { # Search this directory first for shared libraries. # This configuration option does not have a default value defined. - # Configuration option global/locking_library. - # This setting is no longer used. - # This configuration option has an automatic default value. - # locking_library = "liblvm2clusterlock.so" - # Configuration option global/abort_on_internal_errors. # Abort a command that encounters an internal error. # Treat any internal errors as fatal errors, aborting the process that @@ -992,14 +952,20 @@ global { # This configuration option has an automatic default value. # lvdisplay_shows_full_device_path = 0 - # Configuration option global/use_lvmetad. - # This setting is no longer used. - use_lvmetad = 0 + # Configuration option global/event_activation. + # Activate LVs based on system-generated device events. + # When a device appears on the system, a system-generated event runs + # the pvscan command to activate LVs if the new PV completes the VG. + # Use auto_activation_volume_list to select which LVs should be + # activated from these events (the default is all.) + # When event_activation is disabled, the system will generally run + # a direct activation command to activate LVs in complete VGs. + event_activation = 1 - # Configuration option global/lvmetad_update_wait_time. - # This setting is no longer used. + # Configuration option global/use_aio. + # Use async I/O when reading and writing devices. # This configuration option has an automatic default value. - # lvmetad_update_wait_time = 0 + # use_aio = 1 # Configuration option global/use_lvmlockd. # Use lvmlockd for locking among hosts using LVM on shared storage. @@ -1681,13 +1647,20 @@ activation { # vgmetadatacopies = 0 # Configuration option metadata/pvmetadatasize. - # Approximate number of sectors to use for each metadata copy. - # VGs with large numbers of PVs or LVs, or VGs containing complex LV - # structures, may need additional space for VG metadata. The metadata - # areas are treated as circular buffers, so unused space becomes filled - # with an archive of the most recent previous versions of the metadata. + # The default size of the metadata area in units of 512 byte sectors. + # The metadata area begins at an offset of the page size from the start + # of the device. The first PE is by default at 1 MiB from the start of + # the device. The space between these is the default metadata area size. + # The actual size of the metadata area may be larger than what is set + # here due to default_data_alignment making the first PE a MiB multiple. + # The metadata area begins with a 512 byte header and is followed by a + # circular buffer used for VG metadata text. The maximum size of the VG + # metadata is about half the size of the metadata buffer. VGs with large + # numbers of PVs or LVs, or VGs containing complex LV structures, may need + # additional space for VG metadata. The --metadatasize option overrides + # this setting. + # This configuration option does not have a default value defined. # This configuration option has an automatic default value. - # pvmetadatasize = 255 # Configuration option metadata/pvmetadataignore. # Ignore metadata areas on a new PV. @@ -1702,11 +1675,6 @@ activation { # This configuration option is advanced. # This configuration option has an automatic default value. # stripesize = 64 - - # Configuration option metadata/dirs. - # This setting is no longer used. - # This configuration option is advanced. - # This configuration option does not have a default value defined. # } # Configuration section report.

5 years, 4 months

1
0
0 / 0

master - makefiles: improving cleaning rules

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=98c21e98b2537d171d5... Commit: 98c21e98b2537d171d558363aaf6adeecc685aea Parent: f54ead831f3a7fcb26dcffe465189b8e052020a3 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Nov 29 21:47:11 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Nov 29 23:05:43 2018 +0100 makefiles: improving cleaning rules --- base/Makefile | 12 +++++++----- device_mapper/Makefile | 15 ++++++++++----- include/Makefile.in | 2 +- libdm/Makefile.in | 2 +- test/unit/Makefile | 8 +++++--- 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/base/Makefile b/base/Makefile index a4b0504..f150ad9 100644 --- a/base/Makefile +++ b/base/Makefile @@ -22,9 +22,11 @@ BASE_SOURCE=\ base/data-struct/hash.c \ base/data-struct/list.c -BASE_DEPENDS=$(addprefix $(top_builddir)/,$(subst .c,.d,$(BASE_SOURCE))) -BASE_OBJECTS=$(addprefix $(top_builddir)/,$(subst .c,.o,$(BASE_SOURCE))) -CLEAN_TARGETS+=$(BASE_DEPENDS) $(BASE_OBJECTS) +BASE_DEPENDS = $(BASE_SOURCE:%.c=%.d) +BASE_OBJECTS = $(BASE_SOURCE:%.c=%.o) +CLEAN_TARGETS += $(BASE_DEPENDS) $(BASE_OBJECTS) \ + $(BASE_SOURCE:%.c=%.gcda) \ + $(BASE_SOURCE:%.c=%.gcno) ifeq ("$(USE_TRACKING)","yes") ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov lcov-reset \ @@ -35,9 +37,9 @@ endif $(BASE_OBJECTS): INCLUDES+=-I$(top_srcdir)/base/ -$(top_builddir)/base/libbase.a: $(BASE_OBJECTS) +base/libbase.a: $(BASE_OBJECTS) @echo " [AR] $@" $(Q) $(RM) $@ $(Q) $(AR) rsv $@ $(BASE_OBJECTS) > /dev/null -CLEAN_TARGETS+=$(top_builddir)/base/libbase.a +CLEAN_TARGETS += base/libbase.a diff --git a/device_mapper/Makefile b/device_mapper/Makefile index 0177040..bb0880d 100644 --- a/device_mapper/Makefile +++ b/device_mapper/Makefile @@ -10,6 +10,9 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# NOTE: this include only works as 'include' for toplevel Makefile +# which defined all top_* variables + DEVICE_MAPPER_SOURCE=\ device_mapper/datastruct/bitset.c \ device_mapper/libdm-common.c \ @@ -28,9 +31,11 @@ DEVICE_MAPPER_SOURCE=\ device_mapper/vdo/vdo_target.c \ device_mapper/vdo/status.c -DEVICE_MAPPER_DEPENDS=$(addprefix $(top_builddir)/,$(subst .c,.d,$(DEVICE_MAPPER_SOURCE))) -DEVICE_MAPPER_OBJECTS=$(addprefix $(top_builddir)/,$(subst .c,.o,$(DEVICE_MAPPER_SOURCE))) -CLEAN_TARGETS+=$(DEVICE_MAPPER_DEPENDS) $(DEVICE_MAPPER_OBJECTS) +DEVICE_MAPPER_DEPENDS = $(DEVICE_MAPPER_SOURCE:%.c=%.d) +DEVICE_MAPPER_OBJECTS = $(DEVICE_MAPPER_SOURCE:%.c=%.o) +CLEAN_TARGETS += $(DEVICE_MAPPER_DEPENDS) $(DEVICE_MAPPER_OBJECTS) \ + $(DEVICE_MAPPER_SOURCE:%.c=%.gcda) \ + $(DEVICE_MAPPER_SOURCE:%.c=%.gcno) #$(DEVICE_MAPPER_DEPENDS): INCLUDES+=$(VDO_INCLUDES) #$(DEVICE_MAPPER_OBJECTS): INCLUDES+=$(VDO_INCLUDES) @@ -44,9 +49,9 @@ endif $(DEVICE_MAPPER_OBJECTS): INCLUDES+=-I$(top_srcdir)/device_mapper/ -$(top_builddir)/device_mapper/libdevice-mapper.a: $(DEVICE_MAPPER_OBJECTS) +device_mapper/libdevice-mapper.a: $(DEVICE_MAPPER_OBJECTS) @echo " [AR] $@" $(Q) $(RM) $@ $(Q) $(AR) rsv $@ $(DEVICE_MAPPER_OBJECTS) > /dev/null -CLEAN_TARGETS+=$(top_builddir)/device_mapper/libdevice-mapper.a +CLEAN_TARGETS += device_mapper/libdevice-mapper.a diff --git a/include/Makefile.in b/include/Makefile.in index dd5dd68..d6c30d1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ include $(top_builddir)/make.tmpl -DISTCLEAN_TARGETS += .configure.h lvm-version.h +DISTCLEAN_TARGETS += configure.h lvm-version.h CLEAN_TARGETS += \ .symlinks \ .symlinks_created \ diff --git a/libdm/Makefile.in b/libdm/Makefile.in index 2a117e6..4ea83d0 100644 --- a/libdm/Makefile.in +++ b/libdm/Makefile.in @@ -105,4 +105,4 @@ install_ioctl_static: $(LIB_STATIC) $(Q) $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F) CLEAN_TARGETS += ioctl/libdevmapper.a -DISTCLEAN_TARGETS += libdevmapper.pc +DISTCLEAN_TARGETS += libdevmapper.pc make.tmpl diff --git a/test/unit/Makefile b/test/unit/Makefile index 44ab541..a37a0aa 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -31,9 +31,11 @@ UNIT_SOURCE=\ test/unit/radix_tree_t.o: test/unit/rt_case1.c -UNIT_DEPENDS=$(subst .c,.d,$(UNIT_SOURCE)) -UNIT_OBJECTS=$(UNIT_SOURCE:%.c=%.o) -CLEAN_TARGETS+=$(UNIT_DEPENDS) $(UNIT_OBJECTS) +UNIT_DEPENDS = $(UNIT_SOURCE:%.c=%.d) +UNIT_OBJECTS = $(UNIT_SOURCE:%.c=%.o) +CLEAN_TARGETS += $(UNIT_DEPENDS) $(UNIT_OBJECTS) \ + $(UNIT_SOURCE:%.c=%.gcda) \ + $(UNIT_SOURCE:%.c=%.gcno) test/unit/unit-test: $(UNIT_OBJECTS) lib/liblvm-internal.a libdaemon/client/libdaemonclient.a $(INTERNAL_LIBS) @echo " [LD] $@"

5 years, 4 months

1
0
0 / 0

master - makefiles: add missing srcdir

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4ddd756d6f0729d5f33... Commit: 4ddd756d6f0729d5f339b0165745cbf61d4ca931 Parent: 98c21e98b2537d171d558363aaf6adeecc685aea Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Nov 29 22:52:10 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Nov 29 23:05:43 2018 +0100 makefiles: add missing srcdir --- Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2561e4b..85dfeac 100644 --- a/Makefile.in +++ b/Makefile.in @@ -173,7 +173,7 @@ endif endif # FIXME: Drop once top-level make is resolved --include test/unit/Makefile +-include $(top_srcdir)/test/unit/Makefile include $(top_srcdir)/device_mapper/Makefile include $(top_srcdir)/base/Makefile

5 years, 4 months

1
0
0 / 0

master - makefiles: avoid dependency calcs for base dir

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f54ead831f3a7fcb26d... Commit: f54ead831f3a7fcb26dcffe465189b8e052020a3 Parent: ceb2f0ad3b2c162a78f7ad1c86de9fd3f1dd0923 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Nov 29 17:34:32 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Nov 29 23:05:43 2018 +0100 makefiles: avoid dependency calcs for base dir For some targets we do not want to generate dependencies. Also add note about usage of such Makefile - it might be possibly better to rename it to different filename to avoid any confusion. --- base/Makefile | 10 +++++++++- device_mapper/Makefile | 2 +- test/unit/Makefile | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/base/Makefile b/base/Makefile index e30cb44..a4b0504 100644 --- a/base/Makefile +++ b/base/Makefile @@ -14,6 +14,9 @@ # Comment to build the advanced radix tree. #base/data-struct/radix-tree.o: CFLAGS += -DSIMPLE_RADIX_TREE +# NOTE: this include only works as 'include' for toplevel Makefile +# which defined all top_* variables + BASE_SOURCE=\ base/data-struct/radix-tree.c \ base/data-struct/hash.c \ @@ -23,7 +26,12 @@ BASE_DEPENDS=$(addprefix $(top_builddir)/,$(subst .c,.d,$(BASE_SOURCE))) BASE_OBJECTS=$(addprefix $(top_builddir)/,$(subst .c,.o,$(BASE_SOURCE))) CLEAN_TARGETS+=$(BASE_DEPENDS) $(BASE_OBJECTS) --include $(BASE_DEPENDS) +ifeq ("$(USE_TRACKING)","yes") +ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov lcov-reset \ + help check check_local check_cluster check_lvmetad check_lvmpolld)) + -include $(BASE_DEPENDS) +endif +endif $(BASE_OBJECTS): INCLUDES+=-I$(top_srcdir)/base/ diff --git a/device_mapper/Makefile b/device_mapper/Makefile index d74a751..0177040 100644 --- a/device_mapper/Makefile +++ b/device_mapper/Makefile @@ -36,7 +36,7 @@ CLEAN_TARGETS+=$(DEVICE_MAPPER_DEPENDS) $(DEVICE_MAPPER_OBJECTS) #$(DEVICE_MAPPER_OBJECTS): INCLUDES+=$(VDO_INCLUDES) ifeq ("$(USE_TRACKING)","yes") -ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov \ +ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov lcov-reset \ help check check_local check_cluster check_lvmetad check_lvmpolld)) -include $(DEVICE_MAPPER_DEPENDS) endif diff --git a/test/unit/Makefile b/test/unit/Makefile index 0530fca..44ab541 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -46,7 +46,7 @@ run-unit-test: test/unit/unit-test LD_LIBRARY_PATH=libdm test/unit/unit-test run ifeq ("$(USE_TRACKING)","yes") -ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov \ +ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov lcov-reset \ help check check_local check_lvmpolld run-unit-test)) -include $(UNIT_DEPENDS) endif

5 years, 4 months

1
0
0 / 0

master - makefiles: updates for less verbosity

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ceb2f0ad3b2c162a78f... Commit: ceb2f0ad3b2c162a78f7ad1c86de9fd3f1dd0923 Parent: 483ed8f76700ad6d7c479c0e41c58970cc266ee7 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Nov 29 17:09:27 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Nov 29 23:05:43 2018 +0100 makefiles: updates for less verbosity --- daemons/cmirrord/Makefile.in | 6 +- daemons/dmeventd/Makefile.in | 21 ++++-- daemons/lvmdbusd/Makefile.in | 19 +++--- daemons/lvmlockd/Makefile.in | 12 +++- daemons/lvmpolld/Makefile.in | 6 +- libdm/Makefile.in | 12 +++- libdm/dm-tools/Makefile.in | 12 +++- libdm/make.tmpl.in | 10 ++- make.tmpl.in | 12 ++-- scripts/Makefile.in | 59 ++++++++++-------- test/Makefile.in | 138 ++++++++++++++++++++++++------------------ tools/Makefile.in | 4 +- udev/Makefile.in | 5 +- 13 files changed, 185 insertions(+), 131 deletions(-) diff --git a/daemons/cmirrord/Makefile.in b/daemons/cmirrord/Makefile.in index a78dafe..0bcd73c 100644 --- a/daemons/cmirrord/Makefile.in +++ b/daemons/cmirrord/Makefile.in @@ -29,8 +29,10 @@ CFLAGS += $(CPG_CFLAGS) $(EXTRA_EXEC_CFLAGS) LDFLAGS += $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) cmirrord: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \ + @echo " [CC] $@" + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \ $(LVMLIBS) $(LMLIBS) $(INTERNAL_LIBS) $(LIBS) install: $(TARGETS) - $(INSTALL_PROGRAM) -D cmirrord $(usrsbindir)/cmirrord + @echo " [INSTALL] $<" + $(Q) $(INSTALL_PROGRAM) -D cmirrord $(usrsbindir)/cmirrord diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in index 56a9e35..2d856f7 100644 --- a/daemons/dmeventd/Makefile.in +++ b/daemons/dmeventd/Makefile.in @@ -60,11 +60,13 @@ CFLAGS_dmeventd.o += $(EXTRA_EXEC_CFLAGS) LIBS += $(PTHREAD_LIBS) dmeventd: $(LIB_SHARED) dmeventd.o - $(CC) $(CFLAGS) -L. $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) dmeventd.o \ + @echo " [CC] $@" + $(Q) $(CC) $(CFLAGS) -L. $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) dmeventd.o \ -o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(INTERNAL_LIBS) $(LIBS) -lm dmeventd.static: $(LIB_STATIC) dmeventd.o - $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) dmeventd.o \ + @echo " [CC] $@" + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) dmeventd.o \ -o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS) $(STATIC_LIBS) ifeq ("@PKGCONFIG@", "yes") @@ -80,23 +82,28 @@ CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES)) endif install_include: $(srcdir)/libdevmapper-event.h - $(INSTALL_DATA) -D $< $(includedir)/$(<F) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DATA) -D $< $(includedir)/$(<F) install_pkgconfig: libdevmapper-event.pc - $(INSTALL_DATA) -D $< $(pkgconfigdir)/devmapper-event.pc + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DATA) -D $< $(pkgconfigdir)/devmapper-event.pc install_lib_dynamic: install_lib_shared install_lib_static: $(LIB_STATIC) - $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F) install_lib: $(INSTALL_LIB_TARGETS) install_dmeventd_dynamic: dmeventd - $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) install_dmeventd_static: dmeventd.static - $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) install_dmeventd: $(INSTALL_DMEVENTD_TARGETS) diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in index 7b62e7e..8d5de28 100644 --- a/daemons/lvmdbusd/Makefile.in +++ b/daemons/lvmdbusd/Makefile.in @@ -51,17 +51,18 @@ include $(top_builddir)/make.tmpl .PHONY: install_lvmdbusd all: - test -x $(LVMDBUSD) || chmod 755 $(LVMDBUSD) + $(Q) test -x $(LVMDBUSD) || chmod 755 $(LVMDBUSD) install_lvmdbusd: - $(INSTALL_DIR) $(sbindir) - $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir) - $(INSTALL_DIR) $(DESTDIR)$(lvmdbusdir) - (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(DESTDIR)$(lvmdbusdir)) - $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(DESTDIR)$(lvmdbusdir) - PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbusdir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES) - $(CHMOD) 755 $(DESTDIR)$(lvmdbusdir)/__pycache__ - $(CHMOD) 444 $(DESTDIR)$(lvmdbusdir)/__pycache__/*.py[co] + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DIR) $(sbindir) + $(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir) + $(Q) $(INSTALL_DIR) $(DESTDIR)$(lvmdbusdir) + $(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(DESTDIR)$(lvmdbusdir)) + $(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(DESTDIR)$(lvmdbusdir) + $(Q) PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbusdir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES) + $(Q) $(CHMOD) 755 $(DESTDIR)$(lvmdbusdir)/__pycache__ + $(Q) $(CHMOD) 444 $(DESTDIR)$(lvmdbusdir)/__pycache__/*.py[co] install_lvm2: install_lvmdbusd diff --git a/daemons/lvmlockd/Makefile.in b/daemons/lvmlockd/Makefile.in index 0f1386b..17fcb40 100644 --- a/daemons/lvmlockd/Makefile.in +++ b/daemons/lvmlockd/Makefile.in @@ -50,16 +50,20 @@ endif lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \ $(top_builddir)/libdaemon/server/libdaemonserver.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LOCK_LIBS) -ldaemonserver $(INTERNAL_LIBS) $(LIBS) + @echo " [CC] $@" + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LOCK_LIBS) -ldaemonserver $(INTERNAL_LIBS) $(LIBS) lvmlockctl: lvmlockctl.o $(top_builddir)/libdaemon/client/libdaemonclient.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o $(INTERNAL_LIBS) $(LIBS) + @echo " [CC] $@" + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o $(INTERNAL_LIBS) $(LIBS) install_lvmlockd: lvmlockd - $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) install_lvmlockctl: lvmlockctl - $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) install_lvm2: install_lvmlockd install_lvmlockctl diff --git a/daemons/lvmpolld/Makefile.in b/daemons/lvmpolld/Makefile.in index 8bf2556..cfda0f6 100644 --- a/daemons/lvmpolld/Makefile.in +++ b/daemons/lvmpolld/Makefile.in @@ -34,10 +34,12 @@ LIBS += $(DAEMON_LIBS) -ldaemonserver $(PTHREAD_LIBS) lvmpolld: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \ $(top_builddir)/libdaemon/server/libdaemonserver.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(INTERNAL_LIBS) $(LIBS) + @echo " [CC] $@" + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(INTERNAL_LIBS) $(LIBS) install_lvmpolld: lvmpolld - $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) install_lvm2: install_lvmpolld diff --git a/libdm/Makefile.in b/libdm/Makefile.in index 8c8334a..2a117e6 100644 --- a/libdm/Makefile.in +++ b/libdm/Makefile.in @@ -65,7 +65,8 @@ device-mapper: all dm-tools.device-mapper: $(TARGETS) libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION): $(LIB_SHARED) - $(LN_S) -f $< $@ + @echo " [LN] $<" + $(Q) $(LN_S) -f $< $@ .PHONY: install_dynamic install_static install_include \ install_ioctl install_ioctl_static \ @@ -86,7 +87,8 @@ install: $(INSTALL_TYPE) install_include install_device-mapper: install install_include: $(srcdir)/libdevmapper.h - $(INSTALL_DATA) -D $< $(includedir)/$(<F) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DATA) -D $< $(includedir)/$(<F) install_dynamic: install_@interface@ @@ -95,10 +97,12 @@ install_static: install_@interface@_static install_ioctl: install_lib_shared install_pkgconfig: libdevmapper.pc - $(INSTALL_DATA) -D $< $(pkgconfigdir)/devmapper.pc + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DATA) -D $< $(pkgconfigdir)/devmapper.pc install_ioctl_static: $(LIB_STATIC) - $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F) CLEAN_TARGETS += ioctl/libdevmapper.a DISTCLEAN_TARGETS += libdevmapper.pc diff --git a/libdm/dm-tools/Makefile.in b/libdm/dm-tools/Makefile.in index 39d411d..abb0e95 100644 --- a/libdm/dm-tools/Makefile.in +++ b/libdm/dm-tools/Makefile.in @@ -80,18 +80,22 @@ ifeq ("@BUILD_DMFILEMAPD@", "yes") CFLAGS_dmfilemapd.o += $(EXTRA_EXEC_CFLAGS) dmfilemapd: $(LIB_SHARED) dmfilemapd.o - $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ + @echo " [CC] $<" + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ -o $@ dmfilemapd.o -L$(top_builddir)/libdm -ldevmapper $(DL_LIBS) $(LIBS) dmfilemapd.static: $(LIB_STATIC) dmfilemapd.o - $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L$(interfacebuilddir) \ + @echo " [CC] $<" + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L$(interfacebuilddir) \ -o $@ dmfilemapd.o $(DL_LIBS) $(LIBS) $(STATIC_LIBS) install_dmfilemapd_dynamic: dmfilemapd - $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) install_dmfilemapd_static: dmfilemapd.static - $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) install_dmfilemapd: $(INSTALL_DMFILEMAPD_TARGETS) diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in index 1365fd1..451ef94 100644 --- a/libdm/make.tmpl.in +++ b/libdm/make.tmpl.in @@ -484,18 +484,20 @@ CLEAN_TARGETS += \ $(POTFILES) $(CLEAN_CFLOW) cleandir: + @echo " [CLEANDIR]" ifneq (,$(firstword $(CLEAN_DIRS))) - $(RM) -r $(CLEAN_DIRS) + $(Q) $(RM) -r $(CLEAN_DIRS) endif - $(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) core + $(Q) $(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) core clean: $(SUBDIRS.clean) cleandir distclean: cleandir $(SUBDIRS.distclean) + @echo " [DISTCLEAN]" ifneq (,$(firstword $(DISTCLEAN_DIRS))) - $(RM) -r $(DISTCLEAN_DIRS) + $(Q) $(RM) -r $(DISTCLEAN_DIRS) endif - $(RM) $(DISTCLEAN_TARGETS) Makefile + $(Q) $(RM) $(DISTCLEAN_TARGETS) Makefile .exported_symbols_generated: $(EXPORTED_HEADER) .exported_symbols $(DEPS) $(Q) set -e; \ diff --git a/make.tmpl.in b/make.tmpl.in index a6642f2..f52a65a 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -481,7 +481,7 @@ ifeq ("@LIB_SUFFIX@","dylib") endif $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION) - @echo " [LN] $<" + @echo " [LN] $@" $(Q) $(LN_S) -f $(<F) $@ CLEAN_TARGETS += $(LDDEPS) .exported_symbols_generated @@ -534,18 +534,20 @@ CLEAN_TARGETS += \ $(POTFILES) $(CLEAN_CFLOW) cleandir: + @echo " [CLEANDIR]" ifneq (,$(firstword $(CLEAN_DIRS))) - $(RM) -r $(CLEAN_DIRS) + $(Q) $(RM) -r $(CLEAN_DIRS) endif - $(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) core + $(Q) $(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) core clean: $(SUBDIRS.clean) cleandir distclean: cleandir $(SUBDIRS.distclean) + @echo " [DISTCLEAN]" ifneq (,$(firstword $(DISTCLEAN_DIRS))) - $(RM) -r $(DISTCLEAN_DIRS) + $(Q) $(RM) -r $(DISTCLEAN_DIRS) endif - $(RM) $(DISTCLEAN_TARGETS) Makefile + $(Q) $(RM) $(DISTCLEAN_TARGETS) Makefile .exported_symbols_generated: $(EXPORTED_HEADER) .exported_symbols $(DEPS) $(Q) set -e; \ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 12d37d0..99acfbc 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -44,11 +44,11 @@ vpath %.sh $(srcdir) vpath %.ocf $(srcdir) %_install: %.sh - $(INSTALL_PROGRAM) -D $< $(sbindir)/$(basename $(<F)) + $(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(basename $(<F)) %_install: %.ocf - $(INSTALL_DIR) $(ocf_scriptdir) - $(INSTALL_SCRIPT) $< $(ocf_scriptdir)/$(basename $(<F)) + $(Q) $(INSTALL_DIR) $(ocf_scriptdir) + $(Q) $(INSTALL_SCRIPT) $< $(ocf_scriptdir)/$(basename $(<F)) install_lvm2: $(LVM_SCRIPTS:.sh=_install) install_device-mapper: $(DM_SCRIPTS:.sh=_install) @@ -59,61 +59,66 @@ install: install_lvm2 install_ocf install_device-mapper # FIXME Customise for other distributions install_initscripts: - $(INSTALL_DIR) $(initdir) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DIR) $(initdir) ifeq ("@BUILD_DMEVENTD@", "yes") - $(INSTALL_SCRIPT) lvm2_monitoring_init_red_hat $(initdir)/lvm2-monitor + $(Q) $(INSTALL_SCRIPT) lvm2_monitoring_init_red_hat $(initdir)/lvm2-monitor endif ifeq ("@BUILD_LVMPOLLD@", "yes") - $(INSTALL_SCRIPT) lvm2_lvmpolld_init_red_hat $(initdir)/lvm2-lvmpolld + $(Q) $(INSTALL_SCRIPT) lvm2_lvmpolld_init_red_hat $(initdir)/lvm2-lvmpolld endif ifeq ("@BUILD_CMIRRORD@", "yes") - $(INSTALL_SCRIPT) cmirrord_init_red_hat $(initdir)/cmirrord + $(Q) $(INSTALL_SCRIPT) cmirrord_init_red_hat $(initdir)/cmirrord endif ifeq ("@BLKDEACTIVATE@", "yes") - $(INSTALL_SCRIPT) blk_availability_init_red_hat $(initdir)/blk-availability + $(Q) $(INSTALL_SCRIPT) blk_availability_init_red_hat $(initdir)/blk-availability endif CFLAGS_lvm2_activation_generator_systemd_red_hat.o += $(EXTRA_EXEC_CFLAGS) lvm2_activation_generator_systemd_red_hat: $(OBJECTS) $(DEPLIBS) $(INTERNAL_LIBS) - $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) $(LVMLIBS) $(INTERNAL_LIBS) $(LIBS) + @echo " [CC] $@" + $(Q) $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) $(LVMLIBS) $(INTERNAL_LIBS) $(LIBS) install_systemd_generators: - $(INSTALL_DIR) $(systemd_generator_dir) - $(INSTALL_PROGRAM) lvm2_activation_generator_systemd_red_hat $(systemd_generator_dir)/lvm2-activation-generator + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DIR) $(systemd_generator_dir) + $(Q) $(INSTALL_PROGRAM) lvm2_activation_generator_systemd_red_hat $(systemd_generator_dir)/lvm2-activation-generator install_systemd_units: install_dbus_service - $(INSTALL_DIR) $(systemd_unit_dir) - $(INSTALL_DATA) lvm2-pvscan.service $(systemd_unit_dir)/lvm2-pvscan@.service + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DIR) $(systemd_unit_dir) + $(Q) $(INSTALL_DATA) lvm2-pvscan.service $(systemd_unit_dir)/lvm2-pvscan@.service ifeq ("@BUILD_DMEVENTD@", "yes") - $(INSTALL_DATA) dm_event_systemd_red_hat.socket $(systemd_unit_dir)/dm-event.socket - $(INSTALL_DATA) dm_event_systemd_red_hat.service $(systemd_unit_dir)/dm-event.service - $(INSTALL_DATA) lvm2_monitoring_systemd_red_hat.service $(systemd_unit_dir)/lvm2-monitor.service + $(Q) $(INSTALL_DATA) dm_event_systemd_red_hat.socket $(systemd_unit_dir)/dm-event.socket + $(Q) $(INSTALL_DATA) dm_event_systemd_red_hat.service $(systemd_unit_dir)/dm-event.service + $(Q) $(INSTALL_DATA) lvm2_monitoring_systemd_red_hat.service $(systemd_unit_dir)/lvm2-monitor.service endif ifeq ("@BLKDEACTIVATE@", "yes") - $(INSTALL_DATA) blk_availability_systemd_red_hat.service $(systemd_unit_dir)/blk-availability.service + $(Q) $(INSTALL_DATA) blk_availability_systemd_red_hat.service $(systemd_unit_dir)/blk-availability.service endif ifeq ("@BUILD_LVMPOLLD@", "yes") - $(INSTALL_DATA) lvm2_lvmpolld_systemd_red_hat.socket $(systemd_unit_dir)/lvm2-lvmpolld.socket - $(INSTALL_DATA) lvm2_lvmpolld_systemd_red_hat.service $(systemd_unit_dir)/lvm2-lvmpolld.service + $(Q) $(INSTALL_DATA) lvm2_lvmpolld_systemd_red_hat.socket $(systemd_unit_dir)/lvm2-lvmpolld.socket + $(Q) $(INSTALL_DATA) lvm2_lvmpolld_systemd_red_hat.service $(systemd_unit_dir)/lvm2-lvmpolld.service endif ifeq ("@BUILD_LVMLOCKD@", "yes") - $(INSTALL_DATA) lvmlockd.service $(systemd_unit_dir)/lvmlockd.service - $(INSTALL_DATA) lvmlocks.service $(systemd_unit_dir)/lvmlocks.service + $(Q) $(INSTALL_DATA) lvmlockd.service $(systemd_unit_dir)/lvmlockd.service + $(Q) $(INSTALL_DATA) lvmlocks.service $(systemd_unit_dir)/lvmlocks.service endif ifeq ("@BUILD_CMIRRORD@", "yes") - $(INSTALL_DATA) lvm2_cmirrord_systemd_red_hat.service $(systemd_unit_dir)/lvm2-cmirrord.service + $(Q) $(INSTALL_DATA) lvm2_cmirrord_systemd_red_hat.service $(systemd_unit_dir)/lvm2-cmirrord.service endif ifeq ("@BUILD_LVMDBUSD@", "yes") - $(INSTALL_DATA) lvm2_lvmdbusd_systemd_red_hat.service $(systemd_unit_dir)/lvm2-lvmdbusd.service + $(Q) $(INSTALL_DATA) lvm2_lvmdbusd_systemd_red_hat.service $(systemd_unit_dir)/lvm2-lvmdbusd.service endif ifeq ("@BUILD_LVMDBUSD@", "yes") install_dbus_service: - $(INSTALL_DIR) $(dbusconfdir) - $(INSTALL_DIR) $(dbusservicedir) - $(INSTALL_DATA) $(top_srcdir)/scripts/com.redhat.lvmdbus1.conf $(dbusconfdir) - $(INSTALL_DATA) com.redhat.lvmdbus1.service $(dbusservicedir) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DIR) $(dbusconfdir) + $(Q) $(INSTALL_DIR) $(dbusservicedir) + $(Q) $(INSTALL_DATA) $(top_srcdir)/scripts/com.redhat.lvmdbus1.conf $(dbusconfdir) + $(Q) $(INSTALL_DATA) com.redhat.lvmdbus1.service $(dbusservicedir) install_systemd_units: install_dbus_service endif diff --git a/test/Makefile.in b/test/Makefile.in index df61f0a..e471a11 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -168,7 +168,8 @@ check_lvmlockd_test: .tests-stamp endif run-unit-test unit-test: - $(MAKE) -C unit $(@) + @echo " [MAKE] $<" + $(Q) $(MAKE) -C unit $(@) DATADIR = $(datadir)/lvm2-testsuite EXECDIR = $(libexecdir)/lvm2-testsuite @@ -199,11 +200,11 @@ LIB_SHARED = check aux inittest utils get lvm-wrapper install: .tests-stamp lib/paths-installed @echo $(srcdir) - $(INSTALL_DIR) $(DATADIR)/{shell,unit,lib,dbus} $(EXECDIR) - $(INSTALL_DATA) shell/*.sh $(DATADIR)/shell - $(INSTALL_DATA) unit/*.sh $(DATADIR)/unit - -$(INSTALL_PROGRAM) unit/unit-test $(DATADIR)/unit - -$(INSTALL_PROGRAM) dbus/*.py $(DATADIR)/dbus/ + $(Q) $(INSTALL_DIR) $(DATADIR)/{shell,unit,lib,dbus} $(EXECDIR) + $(Q) $(INSTALL_DATA) shell/*.sh $(DATADIR)/shell + $(Q) $(INSTALL_DATA) unit/*.sh $(DATADIR)/unit + -$(Q) $(INSTALL_PROGRAM) unit/unit-test $(DATADIR)/unit + -$(Q) $(INSTALL_PROGRAM) dbus/*.py $(DATADIR)/dbus/ $(INSTALL_DATA) lib/paths-installed $(DATADIR)/lib/paths cd lib && $(INSTALL_DATA) \ $(LIB_FLAVOURS) \ @@ -223,25 +224,31 @@ install: .tests-stamp lib/paths-installed @cd $(EXECDIR) && for i in $(LIB_LINK_NOT); do \ echo "$(LN_S) -f not $$i"; \ $(LN_S) -f not $$i; done - $(INSTALL_PROGRAM) -D lib/runner $(bindir)/lvm2-testsuite + $(Q) $(INSTALL_PROGRAM) -D lib/runner $(bindir)/lvm2-testsuite lib/should: lib/not - $(LN_S) -f not lib/should + @echo " [LN] $@" + $(Q) $(LN_S) -f not lib/should lib/invalid: lib/not - $(LN_S) -f not lib/invalid + @echo " [LN] $@" + $(Q) $(LN_S) -f not lib/invalid lib/fail: lib/not - $(LN_S) -f not lib/fail + @echo " [LN] $@" + $(Q) $(LN_S) -f not lib/fail lib/runner: lib/runner.o .lib-dir-stamp - $(CXX) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $< + @echo " [CXX] $@" + $(Q) $(CXX) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $< lib/dmsecuretest: lib/dmsecuretest.o .lib-dir-stamp $(INTERNAL_LIBS) - $(CC) -g $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $< $(INTERNAL_LIBS) $(LIBS) + @echo " [CC] $@" + $(Q) $(CC) -g $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $< $(INTERNAL_LIBS) $(LIBS) lib/securetest: lib/dmsecuretest.o .lib-dir-stamp - $(CC) -g $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $< -L$(top_builddir)/libdm/ioctl -ldevmapper $(LIBS) + @echo " [CC] $@" + $(Q) $(CC) -g $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $< -L$(top_builddir)/libdm/ioctl -ldevmapper $(LIBS) lib/runner.o: $(wildcard $(srcdir)/lib/*.h) @@ -249,85 +256,98 @@ CFLAGS_runner.o += $(EXTRA_EXEC_CFLAGS) CFLAGS_dmsecuretest.o += $(EXTRA_EXEC_CFLAGS) lib/%: lib/%.o .lib-dir-stamp - $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -o $@ $< + @echo " [CC] $@" + $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -o $@ $< lib/%: $(srcdir)/lib/%.sh .lib-dir-stamp - cp $< $@ - $(CHMOD) +x $@ + @echo " [CP] $@" + $(Q) cp $< $@ + $(Q) $(CHMOD) +x $@ lib/flavour-%: $(srcdir)/lib/flavour-%.sh .lib-dir-stamp - cp $< $@ + @echo " [FLAVOUR] $<" + $(Q) cp $< $@ lib/paths-common: $(srcdir)/Makefile.in .lib-dir-stamp Makefile - echo 'DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t - echo 'LVMPOLLD_PIDFILE="@LVMPOLLD_PIDFILE@"' >> $@-t - echo 'DMEVENTD_PIDFILE="@DMEVENTD_PIDFILE@"' >> $@-t - echo 'LVM_TEST_THIN_CHECK_CMD=$${LVM_TEST_THIN_CHECK_CMD-@THIN_CHECK_CMD@}' >> $@-t - echo 'LVM_TEST_THIN_DUMP_CMD=$${LVM_TEST_THIN_DUMP_CMD-@THIN_DUMP_CMD@}' >> $@-t - echo 'LVM_TEST_THIN_REPAIR_CMD=$${LVM_TEST_THIN_REPAIR_CMD-@THIN_REPAIR_CMD@}' >> $@-t - echo 'LVM_TEST_THIN_RESTORE_CMD=$${LVM_TEST_THIN_RESTORE_CMD-@THIN_RESTORE_CMD@}' >> $@-t - echo 'LVM_TEST_CACHE_CHECK_CMD=$${LVM_TEST_CACHE_CHECK_CMD-@CACHE_CHECK_CMD@}' >> $@-t - echo 'LVM_TEST_CACHE_DUMP_CMD=$${LVM_TEST_CACHE_DUMP_CMD-@CACHE_DUMP_CMD@}' >> $@-t - echo 'LVM_TEST_CACHE_REPAIR_CMD=$${LVM_TEST_CACHE_REPAIR_CMD-@CACHE_REPAIR_CMD@}' >> $@-t - echo 'LVM_TEST_CACHE_RESTORE_CMD=$${LVM_TEST_CACHE_RESTORE_CMD-@CACHE_RESTORE_CMD@}' >> $@-t - echo 'export DM_UDEV_SYNCHRONISATION THIN RAID CACHE\' >> $@-t - echo ' LVM_TEST_THIN_CHECK_CMD LVM_TEST_THIN_DUMP_CMD LVM_TEST_THIN_REPAIR_CMD LVM_TEST_THIN_RESTORE_CMD\' >> $@-t - echo ' LVM_TEST_CACHE_CHECK_CMD LVM_TEST_CACHE_DUMP_CMD LVM_TEST_CACHE_REPAIR_CMD LVM_TEST_CACHE_RESTORE_CMD' >> $@-t - mv $@-t $@ + @echo " [PATHS] $@" + $(Q) echo 'DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t + $(Q) echo 'LVMPOLLD_PIDFILE="@LVMPOLLD_PIDFILE@"' >> $@-t + $(Q) echo 'DMEVENTD_PIDFILE="@DMEVENTD_PIDFILE@"' >> $@-t + $(Q) echo 'LVM_TEST_THIN_CHECK_CMD=$${LVM_TEST_THIN_CHECK_CMD-@THIN_CHECK_CMD@}' >> $@-t + $(Q) echo 'LVM_TEST_THIN_DUMP_CMD=$${LVM_TEST_THIN_DUMP_CMD-@THIN_DUMP_CMD@}' >> $@-t + $(Q) echo 'LVM_TEST_THIN_REPAIR_CMD=$${LVM_TEST_THIN_REPAIR_CMD-@THIN_REPAIR_CMD@}' >> $@-t + $(Q) echo 'LVM_TEST_THIN_RESTORE_CMD=$${LVM_TEST_THIN_RESTORE_CMD-@THIN_RESTORE_CMD@}' >> $@-t + $(Q) echo 'LVM_TEST_CACHE_CHECK_CMD=$${LVM_TEST_CACHE_CHECK_CMD-@CACHE_CHECK_CMD@}' >> $@-t + $(Q) echo 'LVM_TEST_CACHE_DUMP_CMD=$${LVM_TEST_CACHE_DUMP_CMD-@CACHE_DUMP_CMD@}' >> $@-t + $(Q) echo 'LVM_TEST_CACHE_REPAIR_CMD=$${LVM_TEST_CACHE_REPAIR_CMD-@CACHE_REPAIR_CMD@}' >> $@-t + $(Q) echo 'LVM_TEST_CACHE_RESTORE_CMD=$${LVM_TEST_CACHE_RESTORE_CMD-@CACHE_RESTORE_CMD@}' >> $@-t + $(Q) echo 'export DM_UDEV_SYNCHRONISATION THIN RAID CACHE\' >> $@-t + $(Q) echo ' LVM_TEST_THIN_CHECK_CMD LVM_TEST_THIN_DUMP_CMD LVM_TEST_THIN_REPAIR_CMD LVM_TEST_THIN_RESTORE_CMD\' >> $@-t + $(Q) echo ' LVM_TEST_CACHE_CHECK_CMD LVM_TEST_CACHE_DUMP_CMD LVM_TEST_CACHE_REPAIR_CMD LVM_TEST_CACHE_RESTORE_CMD' >> $@-t + $(Q) mv $@-t $@ lib/paths-installed: lib/paths-common - $(RM) $@-t - cat lib/paths-common > $@-t - echo 'installed_testsuite=1' >> $@-t - echo 'export PATH=@libexecdir@/lvm2-testsuite:@datadir@/lvm2-testsuite/lib:$$PATH' >> $@-t - mv $@-t $@ + @echo " [PATHS] $@" + $(Q) $(RM) $@-t + $(Q) cat lib/paths-common > $@-t + $(Q) echo 'installed_testsuite=1' >> $@-t + $(Q) echo 'export PATH=@libexecdir@/lvm2-testsuite:@datadir@/lvm2-testsuite/lib:$$PATH' >> $@-t + $(Q) mv $@-t $@ lib/paths: lib/paths-common - $(RM) $@-t - cat lib/paths-common > $@-t - echo 'top_srcdir="$(top_srcdir)"' >> $@-t - echo 'abs_top_builddir="$(abs_top_builddir)"' >> $@-t - echo 'abs_top_srcdir="$(abs_top_srcdir)"' >> $@-t - echo 'abs_srcdir="$(abs_srcdir)"' >> $@-t - echo 'abs_builddir="$(abs_builddir)"' >> $@-t - mv $@-t $@ + @echo " [PATHS] $@" + $(Q) $(RM) $@-t + $(Q) cat lib/paths-common > $@-t + $(Q) echo 'top_srcdir="$(top_srcdir)"' >> $@-t + $(Q) echo 'abs_top_builddir="$(abs_top_builddir)"' >> $@-t + $(Q) echo 'abs_top_srcdir="$(abs_top_srcdir)"' >> $@-t + $(Q) echo 'abs_srcdir="$(abs_srcdir)"' >> $@-t + $(Q) echo 'abs_builddir="$(abs_builddir)"' >> $@-t + $(Q) mv $@-t $@ lib/version-expected: $(top_srcdir)/VERSION .lib-dir-stamp - cut -f 1 -d ' ' <$< >$@ + $(Q) cut -f 1 -d ' ' <$< >$@ lib/dm-version-expected: $(top_srcdir)/VERSION_DM .lib-dir-stamp - cut -f 1 -d ' ' <$< >$@ + $(Q) cut -f 1 -d ' ' <$< >$@ CMDS = lvm $(shell cat $(top_builddir)/tools/.commands 2>/dev/null) LIB = $(addprefix lib/, $(LIB_SECURETEST) $(LIB_DMSECURETEST) $(LIB_SHARED) $(LIB_LOCAL) $(LIB_NOT) $(LIB_LINK_NOT) $(LIB_FLAVOURS)) .tests-stamp: $(ALL) $(LIB) $(SUBDIRS) lib/version-expected lib/dm-version-expected + @echo " [TEST-STAMP]" @if test "$(srcdir)" != . ; then \ echo "Linking tests to builddir."; \ $(MKDIR_P) shell; \ for f in $(subst $(srcdir)/,,$(ALL)); do \ + test -n "$(Q)" || echo "$(LN_S) -f $(abs_top_srcdir)/test/$$f $$f"; \ $(LN_S) -f $(abs_top_srcdir)/test/$$f $$f; \ done; \ fi - @$(MKDIR_P) -m a=rwx $(LVM_TEST_RESULTS) - touch $@ + $(Q) $(MKDIR_P) -m a=rwx $(LVM_TEST_RESULTS) + $(Q) touch $@ .lib-dir-stamp: - $(MKDIR_P) lib unit - $(RM) lib/clvmd - for i in $(CMDS); do $(LN_S) -f lvm-wrapper lib/$$i; done - for i in daemons/dmeventd/dmeventd \ + @echo " [LIB-STAMP]" + $(Q) $(MKDIR_P) lib unit + $(Q) $(RM) lib/clvmd + @for i in $(CMDS); do \ + test -n "$(Q)" || echo "$(LN_S) -f lvm-wrapper lib/$$i"; \ + $(LN_S) -f lvm-wrapper lib/$$i; done + @for i in daemons/dmeventd/dmeventd \ libdm/dm-tools/dmsetup \ daemons/lvmpolld/lvmpolld ; do \ + test -n "$(Q)" || echo "$(LN_S) -f $(abs_top_builddir)/$$i lib/"; \ $(LN_S) -f $(abs_top_builddir)/$$i lib/; done - $(LN_S) -f $(abs_top_builddir)/libdm/dm-tools/dmsetup lib/dmstats - $(LN_S) -f $(abs_top_srcdir)/conf/lvmdbusd.profile lib/ - $(LN_S) -f $(abs_top_srcdir)/conf/thin-performance.profile lib/ - $(LN_S) -f $(abs_top_srcdir)/scripts/fsadm.sh lib/fsadm - test "$(srcdir)" = . || \ + $(Q) $(LN_S) -f $(abs_top_builddir)/libdm/dm-tools/dmsetup lib/dmstats + $(Q) $(LN_S) -f $(abs_top_srcdir)/conf/lvmdbusd.profile lib/ + $(Q) $(LN_S) -f $(abs_top_srcdir)/conf/thin-performance.profile lib/ + $(Q) $(LN_S) -f $(abs_top_srcdir)/scripts/fsadm.sh lib/fsadm + @test "$(srcdir)" = . || \ for i in $(LIB_LVMLOCKD_CONF) $(LIB_MKE2FS_CONF); do \ + test -n "$(Q)" || echo "$(LN_S) -f $(abs_top_srcdir)/test/lib/$$i lib/"; \ $(LN_S) -f $(abs_top_srcdir)/test/lib/$$i lib/; done - touch $@ + $(Q) touch $@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ diff --git a/tools/Makefile.in b/tools/Makefile.in index e21ca63..4be1f72 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -133,7 +133,7 @@ man-generator.c: command.c man-generator: man-generator.o @echo " [CC] $@" - $(CC) $(CFLAGS) -o $@ $< + $(Q) $(CC) $(CFLAGS) -o $@ $< lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(INTERNAL_LIBS) @echo " [CC] $@" @@ -225,7 +225,7 @@ install_tools_dynamic: lvm .commands $(Q) $(INSTALL_PROGRAM) -D lvm $(sbindir)/lvm @echo Creating symbolic links for individual commands in $(sbindir) @for v in `cat .commands`; do \ - echo "$(LN_S) -f lvm $(sbindir)/$$v"; \ + test -n "$(Q)" || echo "$(LN_S) -f lvm $(sbindir)/$$v"; \ $(LN_S) -f lvm $(sbindir)/$$v; \ done; diff --git a/udev/Makefile.in b/udev/Makefile.in index 6f57d46..81c2c7b 100644 --- a/udev/Makefile.in +++ b/udev/Makefile.in @@ -55,10 +55,11 @@ PVSCAN_ACTION=add endif %.rules: $(srcdir)/%.rules.in - $(SED) -e "s+(DM_DIR)+$(DM_DIR)+;s+(BINDIR)+$(BINDIR)+;s+(BLKID_RULE)+$(BLKID_RULE)+;s+(PVSCAN_RULE)+$(PVSCAN_RULE)+;s+(PVSCAN_ACTION)+$(PVSCAN_ACTION)+;s+(DM_EXEC_RULE)+$(DM_EXEC_RULE)+;s+(DM_EXEC)+$(DM_EXEC)+;s+(LVM_EXEC_RULE)+$(LVM_EXEC_RULE)+;s+(LVM_EXEC)+$(LVM_EXEC)+;" $< >$@ + $(Q) $(SED) -e "s+(DM_DIR)+$(DM_DIR)+;s+(BINDIR)+$(BINDIR)+;s+(BLKID_RULE)+$(BLKID_RULE)+;s+(PVSCAN_RULE)+$(PVSCAN_RULE)+;s+(PVSCAN_ACTION)+$(PVSCAN_ACTION)+;s+(DM_EXEC_RULE)+$(DM_EXEC_RULE)+;s+(DM_EXEC)+$(DM_EXEC)+;s+(LVM_EXEC_RULE)+$(LVM_EXEC_RULE)+;s+(LVM_EXEC)+$(LVM_EXEC)+;" $< >$@ %_install: %.rules - $(INSTALL_DATA) -D $< $(udevdir)/$(<F) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DATA) -D $< $(udevdir)/$(<F) all: $(DM_RULES) $(LVM_RULES) CLEAN_TARGETS = $(DM_RULES) $(LVM_RULES)

5 years, 4 months

1
0
0 / 0

master - makefiles: improve lcov generator

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=483ed8f76700ad6d7c4... Commit: 483ed8f76700ad6d7c479c0e41c58970cc266ee7 Parent: 8bb5dd54303df384233a06057d9258385d0363ec Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Nov 23 13:07:50 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Nov 29 23:05:43 2018 +0100 makefiles: improve lcov generator Simplify generation of lcov report. --- Makefile.in | 34 +++++++--------------------------- 1 files changed, 7 insertions(+), 27 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6a1a990..2561e4b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -148,18 +148,8 @@ install_all_man: install_tmpfiles_configuration: $(MAKE) -C scripts install_tmpfiles_configuration -LCOV_TRACES = libdm.info lib.info tools.info \ - libdaemon/client.info libdaemon/server.info \ - test/unit.info \ - daemons/clvmd.info \ - daemons/dmeventd.info \ - daemons/lvmlockd.info \ - daemons/lvmpolld.info - -CLEAN_TARGETS += $(LCOV_TRACES) - ifneq ("$(LCOV)", "") -.PHONY: lcov-reset lcov lcov-dated $(LCOV_TRACES) +.PHONY: lcov-reset lcov lcov-dated ifeq ($(MAKECMDGOALS),lcov-dated) LCOV_REPORTS_DIR := lcov_reports-$(shell date +%Y%m%d%k%M%S) @@ -169,25 +159,15 @@ LCOV_REPORTS_DIR := lcov_reports endif lcov-reset: - $(LCOV) --zerocounters $(addprefix -d , $(basename $(LCOV_TRACES))) - -# maybe use subdirs processing to create tracefiles... -$(LCOV_TRACES): - $(LCOV) -b $(basename $@) -d $(basename $@) \ - --ignore-errors source -c -o - | $(SED) \ - -e "s/$dmeventd_lvm.[ch]$/plugins\/lvm2\/\1/" \ - -e "s/dmeventd_$mirror\|snapshot\|thin\|raid$\.c/plugins\/\1\/dmeventd_\1\.c/" \ - >$@ + $(LCOV) --zerocounters --directory $(top_builddir) ifneq ("$(GENHTML)", "") -lcov: $(LCOV_TRACES) - $(RM) -r $(LCOV_REPORTS_DIR) +lcov: + $(RM) -rf $(LCOV_REPORTS_DIR) $(MKDIR_P) $(LCOV_REPORTS_DIR) - for i in $(LCOV_TRACES); do \ - test -s $$i -a $$(wc -w <$$i) -ge 100 && lc="$$lc $$i"; \ - done; \ - test -z "$$lc" || $(GENHTML) -p @abs_top_builddir@ \ - -o $(LCOV_REPORTS_DIR) $$lc + $(LCOV) --capture --directory $(top_builddir) --output-file $(LCOV_REPORTS_DIR)/out.info + -test !-s $(LCOV_REPORTS_DIR)/out.info || \ + $(GENHTML) -o $(LCOV_REPORTS_DIR) --ignore-errors source $(LCOV_REPORTS_DIR)/out.info endif endif

5 years, 4 months

1
0
0 / 0

master - base: use calloc

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8bb5dd54303df384233... Commit: 8bb5dd54303df384233a06057d9258385d0363ec Parent: cb04b84c79f10e6b3f1b376cf7611d0afed26c39 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Nov 27 12:12:51 2018 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Nov 29 23:05:43 2018 +0100 base: use calloc Make zalloc a wrapper over calloc --- base/memory/zalloc.h | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/base/memory/zalloc.h b/base/memory/zalloc.h index d2ef827..4f6df54 100644 --- a/base/memory/zalloc.h +++ b/base/memory/zalloc.h @@ -20,10 +20,7 @@ static inline void *zalloc(size_t len) { - void *ptr = malloc(len); - if (ptr) - memset(ptr, 0, len); - return ptr; + return calloc(1, len); } //----------------------------------------------------------------

5 years, 4 months

1
0
0 / 0

master - scan: md metadata version 0.90 is at the end of disk

by David Teigland

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=cb04b84c79f10e6b3f1... Commit: cb04b84c79f10e6b3f1b376cf7611d0afed26c39 Parent: cd0fb0846db0d0bc04469914f6866a04af377548 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu Nov 29 12:35:54 2018 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Nov 29 12:35:54 2018 -0600 scan: md metadata version 0.90 is at the end of disk commit de28637 scan: use full md filter when md 1.0 devices are present missed the fact that md superblock version 0.90 also puts metadata at the end of the device, so the full md filter needs to be used when either 0.90 or 1.0 is present. --- lib/device/dev-md.c | 2 +- lib/filters/filter-md.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/device/dev-md.c b/lib/device/dev-md.c index ac99f42..9c626dd 100644 --- a/lib/device/dev-md.c +++ b/lib/device/dev-md.c @@ -422,7 +422,7 @@ int dev_is_md_with_end_superblock(struct dev_types *dt, struct device *dev) log_very_verbose("Device %s %s is %s.", dev_name(dev), attribute, version_string); - if (!strcmp(version_string, "1.0")) + if (!strcmp(version_string, "1.0") || !strcmp(version_string, "0.90")) return 1; return 0; } diff --git a/lib/filters/filter-md.c b/lib/filters/filter-md.c index 2214986..0275923 100644 --- a/lib/filters/filter-md.c +++ b/lib/filters/filter-md.c @@ -46,7 +46,7 @@ * 3. use udev to detect components * * mode 1 will not detect and exclude components of md devices - * that use superblock version 1.0 which is at the end of the device. + * that use superblock version 0.9 or 1.0 which is at the end of the device. * * mode 2 will detect these, but mode 2 doubles the i/o done by label * scan, since there's a read at both the start and end of every device. @@ -59,11 +59,11 @@ * * - the command is pvcreate/vgcreate/vgextend, which format new * devices, and if the user ran these commands on a component - * device of an md device 1.0, then it would cause problems. + * device of an md device 0.9 or 1.0, then it would cause problems. * FIXME: this would only really need to scan the end of the * devices being formatted, not all devices. * - * - it sees an md device on the system using version 1.0. + * - it sees an md device on the system using version 0.9 or 1.0. * The point of this is just to avoid displaying md components * from the 'pvs' command. * FIXME: the cost (double i/o) may not be worth the benefit

5 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits November 2018