Hello community,
here is the log from the commit of package lvm2 for openSUSE:Factory checked in
at 2017-04-25 08:55:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lvm2 (Old)
and /work/SRC/openSUSE:Factory/.lvm2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lvm2"
Tue Apr 25 08:55:28 2017 rev:101 rq:489075 version:2.02.170
Changes:
--------
--- /work/SRC/openSUSE:Factory/lvm2/device-mapper.changes 2017-03-03
17:33:26.903127529 +0100
+++ /work/SRC/openSUSE:Factory/.lvm2.new/device-mapper.changes 2017-04-25
08:55:32.521539971 +0200
@@ -1,0 +2,39 @@
+Tue Apr 18 11:07:01 UTC 2017 - tchva...@suse.com
+
+- Update to 2.02.170:
+ * Few smal fixes around; obsoleted 169 release that was removed
+ from mirrors
+- Refresh patch:
+ * display-dm-name-for-lv-name.diff
+
+-------------------------------------------------------------------
+Wed Apr 12 01:33:15 UTC 2017 - z...@suse.com
+
+- Update device mapper version to 1.02.138, see WHATS_NEW_DM for
+ detailed changelogs
+ * Drop obsolete lvmchange files accordingly
+- Refresh libdm-iface-not-output-error-message-inside-retry-loop.patch
+- Refresh make-mirror-legs-on-different-tag-pvs.patch
+- device-mapper-dmsetup-export.patch
+
+-------------------------------------------------------------------
+Mon Apr 10 23:08:45 UTC 2017 - jnelson-s...@jamponi.net
+
+- Version update to 2.02.169 release, see WHATS_NEW and WHATS_NEW_DM
+ files for detailed changelogs
+
+-------------------------------------------------------------------
+Mon Apr 10 10:41:02 UTC 2017 - tchva...@suse.com
+
+- Split configure options to have one per line
+- Pass over with spec-cleaner
+- Enable internal cache
+- Enable lvmpolld
+
+-------------------------------------------------------------------
+Mon Apr 10 07:41:10 UTC 2017 - z...@suse.com
+
+- Add 'lvm2-lockd' subpackage, fate#323203 to lvm2-clvm to not pull
+ corosync and other deps to the core lvm2 package
+
+-------------------------------------------------------------------
lvm2-clvm.changes: same change
lvm2.changes: same change
Old:
----
LVM2.2.02.168.tgz
LVM2.2.02.168.tgz.asc
New:
----
LVM2.2.02.170.tgz
LVM2.2.02.170.tgz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ device-mapper.spec ++++++
--- /var/tmp/diff_new_pack.7IBmYe/_old 2017-04-25 08:55:36.173023645 +0200
+++ /var/tmp/diff_new_pack.7IBmYe/_new 2017-04-25 08:55:36.177023079 +0200
@@ -16,15 +16,13 @@
#
+%define libname libdevmapper1_03
+%define libname_event libdevmapper-event1_03
### COMMON-DEF-BEGIN ###
-%define lvm2_version 2.02.168
-%define device_mapper_version 1.02.137
+%define lvm2_version 2.02.170
+%define device_mapper_version 1.02.139
%define thin_provisioning_version 0.5.6
### COMMON-DEF-END ###
-
-%define libname libdevmapper1_03
-%define libname_event libdevmapper-event1_03
-
Name: device-mapper
Version: %{device_mapper_version}
Release: 0
@@ -35,7 +33,18 @@
Source: ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz
Source1: ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz.asc
Source99: baselibs.conf
-
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: suse-module-tools
+BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version}
+BuildRequires: pkgconfig(libselinux)
+BuildRequires: pkgconfig(libsepol)
+BuildRequires: pkgconfig(libudev)
+BuildRequires: pkgconfig(systemd)
+Requires: thin-provisioning-tools >= %{thin_provisioning_version}
+Requires(post): coreutils
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
### COMMON-PATCH-BEGIN ###
# Upstream patches
# SUSE patches: 1000+ for LVM, 2000+ for device mapper
@@ -93,19 +102,6 @@
Patch2012: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
### COMMON-PATCH-END ###
-BuildRequires: gcc-c++
-BuildRequires: pkgconfig
-BuildRequires: suse-module-tools
-BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version}
-BuildRequires: pkgconfig(libselinux)
-BuildRequires: pkgconfig(libsepol)
-BuildRequires: pkgconfig(libudev)
-BuildRequires: pkgconfig(systemd)
-Requires: thin-provisioning-tools >= %{thin_provisioning_version}
-Requires(post): coreutils
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%{?systemd_requires}
-
%description
Programs and man pages for configuring and using the device mapper.
@@ -152,8 +148,10 @@
export PATH=$PATH:/sbin:%{_prefix}/sbin
sed -ie "s/%{device_mapper_version}/1.03.01/g" VERSION_DM
%configure \
- --enable-dmeventd --enable-cmdlib \
- --enable-udev_rules --enable-udev_sync \
+ --enable-dmeventd \
+ --enable-cmdlib \
+ --enable-udev_rules \
+ --enable-udev_sync \
--with-udev-prefix="%{_prefix}/" \
--enable-selinux \
--enable-pkgconfig \
@@ -223,9 +221,9 @@
%{_sbindir}/dmsetup
%{_sbindir}/dmeventd
%{_sbindir}/dmstats
-%{_mandir}/man8/dmstats.8.*
-%{_mandir}/man8/dmsetup.8.*
-%{_mandir}/man8/dmeventd.8.*
+%{_mandir}/man8/dmstats.8%{ext_man}
+%{_mandir}/man8/dmsetup.8%{ext_man}
+%{_mandir}/man8/dmeventd.8%{ext_man}
%{_udevrulesdir}/10-dm.rules
%{_udevrulesdir}/13-dm-disk.rules
%{_udevrulesdir}/95-dm-notify.rules
@@ -236,6 +234,7 @@
##############################################################################
# Library for device-mapper
##############################################################################
+
%package -n %{libname}
Summary: Library for device-mapper
Group: System/Libraries
@@ -255,6 +254,7 @@
##############################################################################
# Event library for device-mapper
##############################################################################
+
%package -n %{libname_event}
Summary: Event library for device-mapper
Group: System/Libraries
@@ -274,6 +274,7 @@
##############################################################################
# Development package for the device mapper
##############################################################################
+
%package devel
Summary: Development package for the device mapper
Group: Development/Libraries/C and C++
++++++ lvm2-clvm.spec ++++++
--- /var/tmp/diff_new_pack.7IBmYe/_old 2017-04-25 08:55:36.233015162 +0200
+++ /var/tmp/diff_new_pack.7IBmYe/_new 2017-04-25 08:55:36.237014596 +0200
@@ -16,12 +16,13 @@
#
+%define dlm_version 3.99.1
+%define sanlock_version 3.3.0
### COMMON-DEF-BEGIN ###
-%define lvm2_version 2.02.168
-%define device_mapper_version 1.02.137
+%define lvm2_version 2.02.170
+%define device_mapper_version 1.02.139
%define thin_provisioning_version 0.5.6
### COMMON-DEF-END ###
-
Name: lvm2-clvm
Version: %{lvm2_version}
Release: 0
@@ -33,7 +34,20 @@
Source1: ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz.asc
Source2: clvmd.ocf
Source3: cmirrord.ocf
-
+BuildRequires: libcorosync-devel
+BuildRequires: libdlm-devel >= %{dlm_version}
+BuildRequires: pkgconfig
+BuildRequires: sanlock-devel >= %{sanlock_version}
+BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version}
+BuildRequires: pkgconfig(blkid)
+BuildRequires: pkgconfig(devmapper)
+BuildRequires: pkgconfig(libudev)
+Requires: corosync
+Requires: device-mapper >= %{device_mapper_version}
+Requires: lvm2 = %{version}
+Requires: lvm2-cmirrord
+Obsoletes: cmirrord < %{version}
+Provides: cmirrord = %{version}
### COMMON-PATCH-BEGIN ###
# Upstream patches
# SUSE patches: 1000+ for LVM, 2000+ for device mapper
@@ -91,19 +105,6 @@
Patch2012: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
### COMMON-PATCH-END ###
-BuildRequires: libcorosync-devel
-BuildRequires: libdlm-devel
-BuildRequires: pkgconfig
-BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version}
-BuildRequires: pkgconfig(devmapper)
-BuildRequires: pkgconfig(libudev)
-Requires: corosync
-Requires: device-mapper >= %{device_mapper_version}
-Requires: lvm2 = %{version}
-Requires: lvm2-cmirrord
-Obsoletes: cmirrord < %{version}
-Provides: cmirrord = %{version}
-
%description
A daemon for using LVM2 Logival Volumes in a clustered environment.
@@ -146,20 +147,30 @@
%build
extra_opts="
+ --enable-applib
+ --enable-blkid_wiping
+ --enable-cmdlib
+ --enable-lvmetad
+ --enable-lvmpolld
+ --enable-realtime
--with-default-locking-dir=/run/lock/lvm
--with-default-pid-dir=/run
--with-default-run-dir=/run/lvm
--with-clvmd=corosync
--with-cluster=internal
--enable-cmirrord
+ --enable-lockd-dlm
+ --enable-lockd-sanlock
"
### COMMON-CONFIG-BEGIN ###
export PATH=$PATH:/sbin:%{_prefix}/sbin
sed -ie "s/%{device_mapper_version}/1.03.01/g" VERSION_DM
%configure \
- --enable-dmeventd --enable-cmdlib \
- --enable-udev_rules --enable-udev_sync \
+ --enable-dmeventd \
+ --enable-cmdlib \
+ --enable-udev_rules \
+ --enable-udev_sync \
--with-udev-prefix="%{_prefix}/" \
--enable-selinux \
--enable-pkgconfig \
@@ -184,8 +195,13 @@
make DESTDIR=%{buildroot} \
install_cluster \
install_systemd_units install_systemd_generators
+make DESTDIR=%{buildroot} install -C daemons/lvmlockd
make DESTDIR=%{buildroot} install -C daemons/cmirrord
+# lvmlockd does not have separate target install the mans by hand for now
+install -m0644 -D man/lvmlockd.8 %{buildroot}%{_mandir}/man8/lvmlockd.8
+install -m0644 -D man/lvmlockctl.8 %{buildroot}%{_mandir}/man8/lvmlockctl.8
+
# ocf files
install -m755 -D %{SOURCE2}
"%{buildroot}/%{_libexecdir}/ocf/resource.d/lvm2/clvmd"
install -m755 -D %{SOURCE3}
"%{buildroot}/%{_libexecdir}/ocf/resource.d/lvm2/cmirrord"
@@ -194,6 +210,8 @@
ln -s service %{buildroot}%{_sbindir}/rclvm2-cluster-activation
ln -s service %{buildroot}%{_sbindir}/rclvm2-clvmd
ln -s service %{buildroot}%{_sbindir}/rclvm2-cmirrord
+ln -s service %{buildroot}%{_sbindir}/rclvm2-lvmlockd
+ln -s service %{buildroot}%{_sbindir}/rclvm2-lvmlocking
# remove files from lvm2 split due to systemd_generators picking them up
rm %{buildroot}%{_unitdir}/blk-availability.service
@@ -201,6 +219,12 @@
rm %{buildroot}%{_unitdir}/dm-event.socket
rm %{buildroot}%{_unitdir}/lvm2-monitor.service
rm %{buildroot}%{_mandir}/man8/lvm2-activation-generator.8
+rm
%{buildroot}%{_libexecdir}/systemd/system-generators/lvm2-activation-generator
+rm %{buildroot}%{_unitdir}/lvm2-lvmetad.service
+rm %{buildroot}%{_unitdir}/lvm2-lvmetad.socket
+rm %{buildroot}%{_unitdir}/lvm2-lvmpolld.service
+rm %{buildroot}%{_unitdir}/lvm2-lvmpolld.socket
+rm %{buildroot}%{_unitdir}/lvm2-pvscan@.service
%files
%defattr(-,root,root)
@@ -214,11 +238,12 @@
%{_unitdir}/lvm2-clvmd.service
%{_unitdir}/lvm2-cluster-activation.service
%{_libexecdir}/systemd/lvm2-cluster-activation
-%{_mandir}/man8/clvmd.8.gz
+%{_mandir}/man8/clvmd.8%{ext_man}
##############################################################################
# Clustered RAID 1 support using device-mapper and corosync
##############################################################################
+
%package -n lvm2-cmirrord
Summary: Clustered RAID 1 support using device-mapper and corosync
Group: Productivity/Clustering/HA
@@ -236,6 +261,44 @@
%{_libexecdir}/ocf/resource.d/lvm2/cmirrord
%{_libexecdir}/systemd/system/lvm2-cmirrord.service
%{_sbindir}/rclvm2-cmirrord
-%{_mandir}/man8/cmirrord.8.*
+%{_mandir}/man8/cmirrord.8%{ext_man}
+
+##############################################################################
+# LVM locking daemon
+##############################################################################
+
+%package -n lvm2-lockd
+Summary: LVM locking daemon
+Group: Productivity/Clustering/HA
+Requires: libdlm >= %{dlm_version}
+Requires: libsanlock1 >= %{sanlock_version}
+Requires: lvm2 = %{version}
+%{?systemd_requires}
+
+%description -n lvm2-lockd
+LVM commands use lvmlockd to coordinate access to shared storage.
+
+%pre -n lvm2-lockd
+%service_add_pre lvm2-lvmlockd.service lvm2-lvmlocking.service
+
+%post -n lvm2-lockd
+%service_add_post lvm2-lvmlockd.service lvm2-lvmlocking.service
+
+%preun -n lvm2-lockd
+%service_del_preun lvm2-lvmlockd.service lvm2-lvmlocking.service
+
+%postun -n lvm2-lockd
+%service_del_postun lvm2-lvmlockd.service lvm2-lvmlocking.service
+
+%files -n lvm2-lockd
+%defattr(-,root,root,)
+%{_sbindir}/lvmlockd
+%{_sbindir}/lvmlockctl
+%{_mandir}/man8/lvmlockd.8%{ext_man}
+%{_mandir}/man8/lvmlockctl.8%{ext_man}
+%{_unitdir}/lvm2-lvmlockd.service
+%{_unitdir}/lvm2-lvmlocking.service
+%{_sbindir}/rclvm2-lvmlockd
+%{_sbindir}/rclvm2-lvmlocking
%changelog
++++++ lvm2.spec ++++++
--- /var/tmp/diff_new_pack.7IBmYe/_old 2017-04-25 08:55:36.277008941 +0200
+++ /var/tmp/diff_new_pack.7IBmYe/_new 2017-04-25 08:55:36.281008375 +0200
@@ -16,16 +16,14 @@
#
-### COMMON-DEF-BEGIN ###
-%define lvm2_version 2.02.168
-%define device_mapper_version 1.02.137
-%define thin_provisioning_version 0.5.6
-### COMMON-DEF-END ###
-
%define _udevdir %(pkg-config --variable=udevdir udev)
%define applib liblvm2app2_2
%define cmdlib liblvm2cmd2_02
-
+### COMMON-DEF-BEGIN ###
+%define lvm2_version 2.02.170
+%define device_mapper_version 1.02.139
+%define thin_provisioning_version 0.5.6
+### COMMON-DEF-END ###
Name: lvm2
Version: %{lvm2_version}
Release: 0
@@ -36,7 +34,22 @@
Source: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
Source1: lvm.conf
Source42: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz.asc
-
+BuildRequires: gcc-c++
+BuildRequires: libaio-devel
+BuildRequires: libselinux-devel
+BuildRequires: pkgconfig
+BuildRequires: readline-devel
+BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version}
+BuildRequires: pkgconfig(blkid)
+BuildRequires: pkgconfig(libudev)
+BuildRequires: pkgconfig(systemd)
+BuildRequires: pkgconfig(udev)
+Requires: device-mapper >= %{device_mapper_version}
+Requires(post): coreutils
+Requires(postun): coreutils
+Provides: lvm = %{version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
### COMMON-PATCH-BEGIN ###
# Upstream patches
# SUSE patches: 1000+ for LVM, 2000+ for device mapper
@@ -94,23 +107,6 @@
Patch2012: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
### COMMON-PATCH-END ###
-BuildRequires: gcc-c++
-BuildRequires: libaio-devel
-BuildRequires: libselinux-devel
-BuildRequires: pkgconfig
-BuildRequires: readline-devel
-BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version}
-BuildRequires: pkgconfig(blkid)
-BuildRequires: pkgconfig(libudev)
-BuildRequires: pkgconfig(systemd)
-BuildRequires: pkgconfig(udev)
-Requires: device-mapper >= %{device_mapper_version}
-Requires(post): coreutils
-Requires(postun): coreutils
-Provides: lvm = %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%{?systemd_requires}
-
%description
Programs and man pages for configuring and using the LVM2 Logical
Volume Manager.
@@ -153,11 +149,13 @@
%build
extra_opts="
+ --enable-applib
--enable-blkid_wiping
--enable-cmdlib
- --enable-applib
- --enable-realtime
--enable-lvmetad
+ --enable-lvmpolld
+ --enable-realtime
+ --with-cache=internal
--with-default-locking-dir=/run/lock/lvm
--with-default-pid-dir=/run
--with-default-run-dir=/run/lvm
@@ -167,8 +165,10 @@
export PATH=$PATH:/sbin:%{_prefix}/sbin
sed -ie "s/%{device_mapper_version}/1.03.01/g" VERSION_DM
%configure \
- --enable-dmeventd --enable-cmdlib \
- --enable-udev_rules --enable-udev_sync \
+ --enable-dmeventd \
+ --enable-cmdlib \
+ --enable-udev_rules \
+ --enable-udev_sync \
--with-udev-prefix="%{_prefix}/" \
--enable-selinux \
--enable-pkgconfig \
@@ -213,6 +213,7 @@
ln -s service %{buildroot}%{_sbindir}/rcblk-availability
ln -s service %{buildroot}%{_sbindir}/rclvm2-lvmetad
ln -s service %{buildroot}%{_sbindir}/rclvm2-monitor
+ln -s service %{buildroot}%{_sbindir}/rclvm2-lvmpolld
# Remove devicemapper binaries, plain rm so we fail if something change
rm %{buildroot}%{_sbindir}/dmsetup
@@ -242,12 +243,12 @@
popd
%pre
-%service_add_pre blk-availability.service lvm2-monitor.service
lvm2-lvmetad.socket lvm2-lvmetad.service
+%service_add_pre blk-availability.service lvm2-monitor.service
lvm2-lvmetad.socket lvm2-lvmetad.service lvm2-lvmpolld.service
lvm2-lvmpolld.socket
%post
/sbin/ldconfig
%{?regenerate_initrd_post}
-%service_add_post blk-availability.service lvm2-monitor.service
lvm2-lvmetad.socket lvm2-lvmetad.service
+%service_add_post blk-availability.service lvm2-monitor.service
lvm2-lvmetad.socket lvm2-lvmetad.service lvm2-lvmpolld.service
lvm2-lvmpolld.socket
# Use %%tmpfiles_create when 13.2 is oldest in support scope
%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/lvm2.conf || :
@@ -255,12 +256,12 @@
%{?regenerate_initrd_posttrans}
%preun
-%service_del_preun blk-availability.service lvm2-monitor.service
lvm2-lvmetad.service
+%service_del_preun blk-availability.service lvm2-monitor.service
lvm2-lvmetad.service lvm2-lvmpolld.service lvm2-lvmpolld.socket
%postun
/sbin/ldconfig
%{?regenerate_initrd_post}
-%service_del_postun blk-availability.service lvm2-monitor.service
lvm2-lvmetad.service
+%service_del_postun blk-availability.service lvm2-monitor.service
lvm2-lvmetad.service lvm2-lvmpolld.service lvm2-lvmpolld.socket
%files
%defattr(-,root,root)
@@ -274,13 +275,13 @@
%{_sbindir}/lvmconfig
%{_sbindir}/lvmdump
%{_sbindir}/lvmetad
+%{_sbindir}/lvmpolld
# Other files
%{_sbindir}/lvchange
%{_sbindir}/lvconvert
%{_sbindir}/lvcreate
%{_sbindir}/lvdisplay
%{_sbindir}/lvextend
-%{_sbindir}/lvmchange
%{_sbindir}/lvmdiskscan
%{_sbindir}/lvmsadc
%{_sbindir}/lvmsar
@@ -320,6 +321,7 @@
%{_sbindir}/vgsplit
%{_sbindir}/rcblk-availability
%{_sbindir}/rclvm2-lvmetad
+%{_sbindir}/rclvm2-lvmpolld
%{_sbindir}/rclvm2-monitor
# compat symlinks in /sbin
/sbin/lvm
@@ -327,12 +329,12 @@
/sbin/lvmconfig
/sbin/lvmdump
/sbin/lvmetad
+/sbin/lvmpolld
/sbin/lvchange
/sbin/lvconvert
/sbin/lvcreate
/sbin/lvdisplay
/sbin/lvextend
-/sbin/lvmchange
/sbin/lvmdiskscan
/sbin/lvmsadc
/sbin/lvmsar
@@ -370,67 +372,67 @@
/sbin/vgs
/sbin/vgscan
/sbin/vgsplit
-%{_mandir}/man5/lvm.conf.5.gz
-%{_mandir}/man7/lvmcache.7.gz
-%{_mandir}/man7/lvmraid.7.gz
-%{_mandir}/man7/lvmreport.7.gz
-%{_mandir}/man7/lvmthin.7.gz
-%{_mandir}/man7/lvmsystemid.7.gz
-%{_mandir}/man8/fsadm.8.gz
-%{_mandir}/man8/lvchange.8.gz
-%{_mandir}/man8/lvconvert.8.gz
-%{_mandir}/man8/lvcreate.8.gz
-%{_mandir}/man8/lvdisplay.8.gz
-%{_mandir}/man8/lvextend.8.gz
-%{_mandir}/man8/lvm.8.gz
-%{_mandir}/man8/lvm2-activation-generator.8.gz
-%{_mandir}/man8/lvm-config.8.gz
-%{_mandir}/man8/lvmconfig.8.gz
-%{_mandir}/man8/lvm-dumpconfig.8.gz
-%{_mandir}/man8/lvmchange.8.gz
-%{_mandir}/man8/lvmconf.8.gz
-%{_mandir}/man8/lvmdiskscan.8.gz
-%{_mandir}/man8/lvmdump.8.gz
-%{_mandir}/man8/lvm-fullreport.8.gz
-%{_mandir}/man8/lvmsadc.8.gz
-%{_mandir}/man8/lvmsar.8.gz
-%{_mandir}/man8/lvreduce.8.gz
-%{_mandir}/man8/lvremove.8.gz
-%{_mandir}/man8/lvrename.8.gz
-%{_mandir}/man8/lvresize.8.gz
-%{_mandir}/man8/lvs.8.gz
-%{_mandir}/man8/lvscan.8.gz
-%{_mandir}/man8/pvchange.8.gz
-%{_mandir}/man8/pvck.8.gz
-%{_mandir}/man8/pvcreate.8.gz
-%{_mandir}/man8/pvdisplay.8.gz
-%{_mandir}/man8/pvmove.8.gz
-%{_mandir}/man8/pvremove.8.gz
-%{_mandir}/man8/pvresize.8.gz
-%{_mandir}/man8/pvs.8.gz
-%{_mandir}/man8/pvscan.8.gz
-%{_mandir}/man8/vgcfgbackup.8.gz
-%{_mandir}/man8/vgcfgrestore.8.gz
-%{_mandir}/man8/vgchange.8.gz
-%{_mandir}/man8/vgck.8.gz
-%{_mandir}/man8/vgconvert.8.gz
-%{_mandir}/man8/vgcreate.8.gz
-%{_mandir}/man8/vgdisplay.8.gz
-%{_mandir}/man8/vgexport.8.gz
-%{_mandir}/man8/vgextend.8.gz
-%{_mandir}/man8/vgimport.8.gz
-%{_mandir}/man8/vgimportclone.8.gz
-%{_mandir}/man8/vgmerge.8.gz
-%{_mandir}/man8/vgmknodes.8.gz
-%{_mandir}/man8/vgreduce.8.gz
-%{_mandir}/man8/vgremove.8.gz
-%{_mandir}/man8/vgrename.8.gz
-%{_mandir}/man8/vgs.8.gz
-%{_mandir}/man8/vgscan.8.gz
-%{_mandir}/man8/vgsplit.8.gz
-%{_mandir}/man8/lvmetad.8.gz
-%{_mandir}/man8/lvm-lvpoll.8.gz
-%{_mandir}/man8/blkdeactivate.8.gz
+%{_mandir}/man5/lvm.conf.5%{ext_man}
+%{_mandir}/man7/lvmcache.7%{ext_man}
+%{_mandir}/man7/lvmraid.7%{ext_man}
+%{_mandir}/man7/lvmreport.7%{ext_man}
+%{_mandir}/man7/lvmthin.7%{ext_man}
+%{_mandir}/man7/lvmsystemid.7%{ext_man}
+%{_mandir}/man8/fsadm.8%{ext_man}
+%{_mandir}/man8/lvchange.8%{ext_man}
+%{_mandir}/man8/lvconvert.8%{ext_man}
+%{_mandir}/man8/lvcreate.8%{ext_man}
+%{_mandir}/man8/lvdisplay.8%{ext_man}
+%{_mandir}/man8/lvextend.8%{ext_man}
+%{_mandir}/man8/lvm.8%{ext_man}
+%{_mandir}/man8/lvm2-activation-generator.8%{ext_man}
+%{_mandir}/man8/lvm-config.8%{ext_man}
+%{_mandir}/man8/lvmconfig.8%{ext_man}
+%{_mandir}/man8/lvm-dumpconfig.8%{ext_man}
+%{_mandir}/man8/lvmconf.8%{ext_man}
+%{_mandir}/man8/lvmdiskscan.8%{ext_man}
+%{_mandir}/man8/lvmdump.8%{ext_man}
+%{_mandir}/man8/lvm-fullreport.8%{ext_man}
+%{_mandir}/man8/lvmsadc.8%{ext_man}
+%{_mandir}/man8/lvmsar.8%{ext_man}
+%{_mandir}/man8/lvreduce.8%{ext_man}
+%{_mandir}/man8/lvremove.8%{ext_man}
+%{_mandir}/man8/lvrename.8%{ext_man}
+%{_mandir}/man8/lvresize.8%{ext_man}
+%{_mandir}/man8/lvs.8%{ext_man}
+%{_mandir}/man8/lvscan.8%{ext_man}
+%{_mandir}/man8/pvchange.8%{ext_man}
+%{_mandir}/man8/pvck.8%{ext_man}
+%{_mandir}/man8/pvcreate.8%{ext_man}
+%{_mandir}/man8/pvdisplay.8%{ext_man}
+%{_mandir}/man8/pvmove.8%{ext_man}
+%{_mandir}/man8/pvremove.8%{ext_man}
+%{_mandir}/man8/pvresize.8%{ext_man}
+%{_mandir}/man8/pvs.8%{ext_man}
+%{_mandir}/man8/pvscan.8%{ext_man}
+%{_mandir}/man8/vgcfgbackup.8%{ext_man}
+%{_mandir}/man8/vgcfgrestore.8%{ext_man}
+%{_mandir}/man8/vgchange.8%{ext_man}
+%{_mandir}/man8/vgck.8%{ext_man}
+%{_mandir}/man8/vgconvert.8%{ext_man}
+%{_mandir}/man8/vgcreate.8%{ext_man}
+%{_mandir}/man8/vgdisplay.8%{ext_man}
+%{_mandir}/man8/vgexport.8%{ext_man}
+%{_mandir}/man8/vgextend.8%{ext_man}
+%{_mandir}/man8/vgimport.8%{ext_man}
+%{_mandir}/man8/vgimportclone.8%{ext_man}
+%{_mandir}/man8/vgmerge.8%{ext_man}
+%{_mandir}/man8/vgmknodes.8%{ext_man}
+%{_mandir}/man8/vgreduce.8%{ext_man}
+%{_mandir}/man8/vgremove.8%{ext_man}
+%{_mandir}/man8/vgrename.8%{ext_man}
+%{_mandir}/man8/vgs.8%{ext_man}
+%{_mandir}/man8/vgscan.8%{ext_man}
+%{_mandir}/man8/vgsplit.8%{ext_man}
+%{_mandir}/man8/lvmetad.8%{ext_man}
+%{_mandir}/man8/blkdeactivate.8%{ext_man}
+%{_mandir}/man8/lvmpolld.8%{ext_man}
+%{_mandir}/man8/lvm-lvpoll.8%{ext_man}
%{_udevdir}/rules.d/11-dm-lvm.rules
%{_udevdir}/rules.d/69-dm-lvm-metad.rules
%dir %{_sysconfdir}/lvm
@@ -456,7 +458,9 @@
%{_unitdir}/lvm2-lvmetad.socket
%{_unitdir}/lvm2-lvmetad.service
%{_unitdir}/lvm2-pvscan@.service
-%{_prefix}/lib/systemd/system-generators/lvm2-activation-generator
+%{_unitdir}/lvm2-lvmpolld.socket
+%{_unitdir}/lvm2-lvmpolld.service
+%{_libexecdir}/systemd/system-generators/lvm2-activation-generator
%dir %{_libdir}/device-mapper
%{_libdir}/device-mapper/libdevmapper-event-lvm2*.so
%{_libdir}/libdevmapper-event-lvm2*.so
@@ -465,6 +469,7 @@
##############################################################################
# LVM2 application api library
##############################################################################
+
%package -n %{applib}
Summary: LVM2 application api library
Group: System/Libraries
@@ -483,6 +488,7 @@
##############################################################################
# LVM2 command line library
##############################################################################
+
%package -n %{cmdlib}
Summary: LVM2 command line library
Group: System/Libraries
@@ -502,6 +508,7 @@
##############################################################################
# Development files for LVM2
##############################################################################
+
%package devel
Summary: Development files for LVM2
Group: Development/Libraries/C and C++
@@ -524,6 +531,7 @@
##############################################################################
# LVM2 Testsuite
##############################################################################
+
%package testsuite
Summary: LVM2 Testsuite
Group: Development/Libraries/C and C++
++++++ LVM2.2.02.168.tgz -> LVM2.2.02.170.tgz ++++++
++++ 99856 lines of diff (skipped)
++++++ device-mapper-dmsetup-export.patch ++++++
--- /var/tmp/diff_new_pack.7IBmYe/_old 2017-04-25 08:55:37.144886222 +0200
+++ /var/tmp/diff_new_pack.7IBmYe/_new 2017-04-25 08:55:37.144886222 +0200
@@ -1,7 +1,20 @@
-Index: LVM2.2.02.139/man/dmsetup.8.in
+From b148cb1c1e801455cb774f51eecd57f7e4f98c39 Mon Sep 17 00:00:00 2001
+From: Eric Ren <z...@suse.com>
+Date: Tue, 11 Apr 2017 10:58:56 +0800
+Subject: [PATCH] DM: add dmsetup export
+
+bsc#479104
+
+Patch-refreshed-by: Eric Ren <z...@suse.com>
+---
+ man/dmsetup.8_main | 16 +++-
+ tools/dmsetup.c | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 266 insertions(+), 2 deletions(-)
+
+Index: LVM2.2.02.169/man/dmsetup.8_main
===================================================================
---- LVM2.2.02.139.orig/man/dmsetup.8.in
-+++ LVM2.2.02.139/man/dmsetup.8.in
+--- LVM2.2.02.169.orig/man/dmsetup.8_main
++++ LVM2.2.02.169/man/dmsetup.8_main
@@ -97,7 +97,15 @@ dmsetup \(em low level logical volume ma
..
.CMD_LOAD
@@ -23,20 +36,20 @@
See below for more information on the table format.
.
.HP
-+.BR \-\-export
++.BR --export
+.IR export
+.br
+Outputs information in key/value format to be imported by other programs.
+.
+.HP
- .BR \-\-udevcookie
+ .BR --udevcookie
.IR cookie
.br
-Index: LVM2.2.02.139/tools/dmsetup.c
+Index: LVM2.2.02.169/tools/dmsetup.c
===================================================================
---- LVM2.2.02.139.orig/tools/dmsetup.c
-+++ LVM2.2.02.139/tools/dmsetup.c
-@@ -2177,6 +2177,129 @@ out:
+--- LVM2.2.02.169.orig/tools/dmsetup.c
++++ LVM2.2.02.169/tools/dmsetup.c
+@@ -2231,6 +2231,129 @@ out:
return r;
}
@@ -166,11 +179,16 @@
/* Show target names and their version numbers */
static int _targets(CMD_ARGS)
{
-@@ -5138,6 +5261,7 @@ static struct command _dmsetup_commands[
- {"deps", "[-o <options>] [<device>]", 0, -1, 1, 0, _deps},
- {"stats", "<command> [<options>] [<devices>]", 1, -1, 1, 1, _stats},
- {"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1,
0, _status},
+@@ -5904,7 +6027,11 @@ static struct command _dmsetup_commands[
+ {"deps", "[-o <options>] [<device>...]", 0, -1, 1, 0, _deps},
+ {"stats", "<command> [<options>] [<device>...]", 1, -1, 1, 1, _stats},
+ {"status", "[<device>...] [--noflush] [--target <target_type>]", 0, -1,
1, 0, _status},
+- {"table", "[<device>...] [--target <target_type>] [--showkeys]", 0, -1,
1, 0, _status},
++ {"deps", "[-o <options>] [<device>]", 0, -1, 1, 0, _deps},
++ {"stats", "<command> [<options>] [<devices>]", 1, -1, 1, 1, _stats},
++ {"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1,
0, _status},
+ {"export", "[<device>]", 0, -1, 1, 0, _export},
- {"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1,
0, _status},
++ {"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1,
0, _status},
{"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, 0, _wait},
- {"mknodes", "[<device>]", 0, -1, 1, 0, _mknodes},
+ {"mknodes", "[<device>...]", 0, -1, 1, 0, _mknodes},
+ {"mangle", "[<device>...]", 0, -1, 1, 0, _mangle},
++++++ display-dm-name-for-lv-name.diff ++++++
--- /var/tmp/diff_new_pack.7IBmYe/_old 2017-04-25 08:55:37.176881697 +0200
+++ /var/tmp/diff_new_pack.7IBmYe/_new 2017-04-25 08:55:37.180881132 +0200
@@ -4,13 +4,13 @@
lib/display/display.c | 13 +++++++++----
3 files changed, 13 insertions(+), 4 deletions(-)
-Index: LVM2.2.02.139/lib/config/config_settings.h
+Index: LVM2.2.02.170/lib/config/config_settings.h
===================================================================
---- LVM2.2.02.139.orig/lib/config/config_settings.h
-+++ LVM2.2.02.139/lib/config/config_settings.h
-@@ -947,6 +947,9 @@ cfg_array(global_cache_check_options_CFG
- cfg_array(global_cache_repair_options_CFG, "cache_repair_options",
global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING,
DEFAULT_CACHE_REPAIR_OPTIONS_CONFIG, vsn(2, 2, 108), NULL, 0, NULL,
- "List of options passed to the cache_repair command.\n")
+--- LVM2.2.02.170.orig/lib/config/config_settings.h
++++ LVM2.2.02.170/lib/config/config_settings.h
+@@ -1039,6 +1039,9 @@ cfg(global_fsadm_executable_CFG, "fsadm_
+ "The full path to the fsadm command.\n"
+ "LVM uses this command to help with lvresize -r operations.\n")
+cfg(global_display_dm_name_for_lv_name_CFG, "display_dm_name_for_lv_name",
global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL,
DEFAULT_DISPLAY_DM_NAME_FOR_LV_NAME, vsn(2, 2, 98), NULL, 0, NULL,
+ "Display dm name for lv name.\n")
@@ -18,10 +18,10 @@
cfg(global_system_id_source_CFG, "system_id_source", global_CFG_SECTION, 0,
CFG_TYPE_STRING, DEFAULT_SYSTEM_ID_SOURCE, vsn(2, 2, 117), NULL, 0, NULL,
"The method LVM uses to set the local system ID.\n"
"Volume Groups can also be given a system ID (by vgcreate, vgchange,\n"
-Index: LVM2.2.02.139/lib/config/defaults.h
+Index: LVM2.2.02.170/lib/config/defaults.h
===================================================================
---- LVM2.2.02.139.orig/lib/config/defaults.h
-+++ LVM2.2.02.139/lib/config/defaults.h
+--- LVM2.2.02.170.orig/lib/config/defaults.h
++++ LVM2.2.02.170/lib/config/defaults.h
@@ -33,6 +33,7 @@
#define DEFAULT_OBTAIN_DEVICE_LIST_FROM_UDEV 1
#define DEFAULT_EXTERNAL_DEVICE_INFO_SOURCE "none"
@@ -30,11 +30,11 @@
#define DEFAULT_MD_COMPONENT_DETECTION 1
#define DEFAULT_FW_RAID_COMPONENT_DETECTION 0
#define DEFAULT_MD_CHUNK_ALIGNMENT 1
-Index: LVM2.2.02.139/lib/display/display.c
+Index: LVM2.2.02.170/lib/display/display.c
===================================================================
---- LVM2.2.02.139.orig/lib/display/display.c
-+++ LVM2.2.02.139/lib/display/display.c
-@@ -371,10 +371,15 @@ int lvdisplay_full(struct cmd_context *c
+--- LVM2.2.02.170.orig/lib/display/display.c
++++ LVM2.2.02.170/lib/display/display.c
+@@ -413,10 +413,15 @@ int lvdisplay_full(struct cmd_context *c
lv->vg->cmd->dev_dir, lv->vg->name, lv->name);
else if (lv_is_visible(lv)) {
/* Thin pool does not have /dev/vg/name link */
++++++ libdm-iface-not-output-error-message-inside-retry-loop.patch ++++++
--- /var/tmp/diff_new_pack.7IBmYe/_old 2017-04-25 08:55:37.208877173 +0200
+++ /var/tmp/diff_new_pack.7IBmYe/_new 2017-04-25 08:55:37.212876608 +0200
@@ -1,22 +1,25 @@
-From a70f17fd1dc9a8cccefb946c3501d5cb6f2766bb Mon Sep 17 00:00:00 2001
-From: Liuhua Wang <lw...@suse.com>
-Date: Mon, 23 Nov 2015 13:49:39 +0800
+From 3c4d9dd3571e89545d97c8421fd4cbdbaa6895b8 Mon Sep 17 00:00:00 2001
+From: Eric Ren <z...@suse.com>
+Date: Tue, 11 Apr 2017 11:09:26 +0800
Subject: [PATCH] libdm-iface: not output error message inside retry loops
-This is a workaround to avoid noisy error message being output inside retry
loops
-in case of remove failure because device busy. But as to the replies from
upstream
+This is a workaround to avoid noisy error message being output inside
+retry loops
+in case of remove failure because device busy. But as to the replies
+from upstream
there may be some issues in udev operations.
References: bsc#940298 boo#957059
Signed-off-by: lw...@suse.com
+Patch-refreshed-by: Eric Ren <z...@suse.com>
---
- libdm/ioctl/libdm-iface.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ libdm/ioctl/libdm-iface.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
-Index: LVM2.2.02.141/libdm/ioctl/libdm-iface.c
-===================================================================
---- LVM2.2.02.141.orig/libdm/ioctl/libdm-iface.c
-+++ LVM2.2.02.141/libdm/ioctl/libdm-iface.c
+diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
+index cb3e8dc..c1c0771 100644
+--- a/libdm/ioctl/libdm-iface.c
++++ b/libdm/ioctl/libdm-iface.c
@@ -62,6 +62,7 @@
*/
#define MAPPER_CTRL_MINOR 236
@@ -25,15 +28,17 @@
/* dm major version no for running kernel */
static unsigned _dm_version = DM_VERSION_MAJOR;
-@@ -1862,7 +1863,7 @@ static struct dm_ioctl *_do_dm_ioctl(str
+@@ -1862,8 +1863,8 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task
*dmt, unsigned command,
dmt->major > 0 && dmt->minor == 0 ?
"0" : "",
dmt->major > 0 ? ")" : "",
strerror(dmt->ioctl_errno));
- else
+- log_error("device-mapper: %s ioctl on %s
%s%s%.0d%s%.0d%s%s "
+ else if(errno != EBUSY || retry_repeat_count == DM_IOCTL_RETRIES)
- log_error("device-mapper: %s ioctl on
%s%s%s%.0d%s%.0d%s%s "
++ log_error("device-mapper: %s ioctl on
%s%s%s%.0d%s%.0d%s%s "
"failed: %s",
_cmd_data_v4[dmt->type].name,
+ dmi->name, dmi->uuid,
@@ -1915,7 +1916,6 @@ void dm_task_update_nodes(void)
update_devs();
}
@@ -42,3 +47,6 @@
#define DM_RETRY_USLEEP_DELAY 200000
int dm_task_get_errno(struct dm_task *dmt)
+--
+2.10.2
+
++++++ make-mirror-legs-on-different-tag-pvs.patch ++++++
--- /var/tmp/diff_new_pack.7IBmYe/_old 2017-04-25 08:55:37.280866994 +0200
+++ /var/tmp/diff_new_pack.7IBmYe/_new 2017-04-25 08:55:37.284866428 +0200
@@ -1,10 +1,10 @@
-From 49a5da732c74b8b96bc123a541d590c4fd06d7af Mon Sep 17 00:00:00 2001
-From: Guangliang Zhao <gz...@suse.com>
-Date: Mon, 12 Nov 2012 15:28:11 +0800
-Subject: [PATCH 1/2] mirror: make mirror legs on different tag pvs
+From b17f2ae4334f9233a88d7a2fcae325f86691beb0 Mon Sep 17 00:00:00 2001
+From: Eric Ren <z...@suse.com>
+Date: Tue, 11 Apr 2017 10:44:30 +0800
+Subject: [PATCH] [PATCH 1/2] mirror: make mirror legs on different tag pvs
-The mirror legs could be placed on the PVs(with different
-tags) from the other mirror legs with this patch.
+The mirror legs could be placed on the PVs(with different tags)
+from the other mirror legs with this patch.
The lvcreate allocates the replica "randomly" when creating
a mirrored logical volume now, so it could happen that both
@@ -17,18 +17,19 @@
always be placed on pvs with differnt tags.
Signed-off-by: Guangliang Zhao <gz...@suse.com>
+Fix-conflict-by: Eric Ren <z...@suse.com>
---
- conf/example.conf.in | 17 +++++++++++++++++
- lib/config/config_settings.h | 3 +++
- lib/config/defaults.h | 1 +
- lib/metadata/lv_manip.c | 35 +++++++++++++++++++++++++++++++++++
- man/lvcreate.8.in | 4 ++++
- 5 files changed, 60 insertions(+)
-
-Index: LVM2.2.02.165/conf/example.conf.in
-===================================================================
---- LVM2.2.02.165.orig/conf/example.conf.in
-+++ LVM2.2.02.165/conf/example.conf.in
+ conf/example.conf.in | 17 +++++++++++++++++
+ lib/config/config_settings.h | 5 ++++-
+ lib/config/defaults.h | 1 +
+ lib/metadata/lv_manip.c | 35 +++++++++++++++++++++++++++++++++++
+ man/lvcreate.8_pregen | 7 +++++++
+ 5 files changed, 64 insertions(+), 1 deletion(-)
+
+diff --git a/conf/example.conf.in b/conf/example.conf.in
+index 614ce53..b33289f 100644
+--- a/conf/example.conf.in
++++ b/conf/example.conf.in
@@ -372,6 +372,23 @@ allocation {
# or erased unless the --wipesignatures option is used directly.
wipe_signatures_when_zeroing_new_lvs = 1
@@ -53,25 +54,27 @@
# Configuration option allocation/mirror_logs_require_separate_pvs.
# Mirror logs and images will always use different PVs.
# The default setting changed in version 2.02.85.
-Index: LVM2.2.02.165/lib/config/config_settings.h
-===================================================================
---- LVM2.2.02.165.orig/lib/config/config_settings.h
-+++ LVM2.2.02.165/lib/config/config_settings.h
-@@ -473,6 +473,9 @@ cfg(allocation_raid_stripe_all_devices_C
+diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
+index b701722..0e5a5e2 100644
+--- a/lib/config/config_settings.h
++++ b/lib/config/config_settings.h
+@@ -473,7 +473,10 @@ cfg(allocation_raid_stripe_all_devices_CFG,
"raid_stripe_all_devices", allocatio
"when the command does not specify the number of stripes to use.\n"
"This was the default behaviour until release 2.02.162.\n")
+-cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG,
"cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION,
CFG_PROFILABLE | CFG_PROFILABLE_METADATA, CFG_TYPE_BOOL,
DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 106), NULL, 0, NULL,
+cfg(allocation_mirror_legs_require_separate_pvs_CFG,
"mirror_legs_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL,
DEFAULT_MIRROR_LEGS_REQUIRE_SEPARATE_PVS, vsn(2, 2, 98), NULL, 0, NULL,
+ "Mirror legs will always use different PVs.\n")
+
- cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG,
"cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, 0,
CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2,
106), NULL, 0, NULL,
++cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG,
"cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, 0,
CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2,
106), NULL, 0, NULL,
"Cache pool metadata and data will always use different PVs.\n")
-Index: LVM2.2.02.165/lib/config/defaults.h
-===================================================================
---- LVM2.2.02.165.orig/lib/config/defaults.h
-+++ LVM2.2.02.165/lib/config/defaults.h
-@@ -158,6 +158,7 @@
+ cfg(allocation_cache_pool_cachemode_CFG, "cache_pool_cachemode",
allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA |
CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_CACHE_MODE, vsn(2, 2, 113),
NULL, vsn(2, 2, 128),
+diff --git a/lib/config/defaults.h b/lib/config/defaults.h
+index 2340636..256fab6 100644
+--- a/lib/config/defaults.h
++++ b/lib/config/defaults.h
+@@ -159,6 +159,7 @@
#define DEFAULT_MAX_LV 0
#define DEFAULT_ALLOC_POLICY ALLOC_NORMAL
#define DEFAULT_MIRROR_LOGS_REQUIRE_SEPARATE_PVS 0
@@ -79,11 +82,11 @@
#define DEFAULT_MAXIMISE_CLING 1
#define DEFAULT_CLUSTERED 0
-Index: LVM2.2.02.165/lib/metadata/lv_manip.c
-===================================================================
---- LVM2.2.02.165.orig/lib/metadata/lv_manip.c
-+++ LVM2.2.02.165/lib/metadata/lv_manip.c
-@@ -1519,6 +1519,9 @@ struct alloc_handle {
+diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
+index 0dfbad4..357e46a 100644
+--- a/lib/metadata/lv_manip.c
++++ b/lib/metadata/lv_manip.c
+@@ -1622,6 +1622,9 @@ struct alloc_handle {
unsigned maximise_cling;
unsigned mirror_logs_separate; /* Force mirror logs on separate PVs? */
@@ -93,7 +96,7 @@
/*
* RAID devices require a metadata area that accompanies each
-@@ -2633,6 +2636,32 @@ static int _limit_to_one_area_per_tag(st
+@@ -2736,6 +2739,32 @@ static int _limit_to_one_area_per_tag(struct
alloc_handle *ah, struct alloc_stat
}
/*
@@ -126,7 +129,7 @@
* Returns 1 regardless of whether any space was found, except on error.
*/
static int _find_some_parallel_space(struct alloc_handle *ah,
-@@ -2762,6 +2791,10 @@ static int _find_some_parallel_space(str
+@@ -2865,6 +2894,10 @@ static int _find_some_parallel_space(struct
alloc_handle *ah,
continue;
case USE_AREA:
@@ -137,7 +140,7 @@
/*
* Except with ALLOC_ANYWHERE, replace
first area with this
* one which is smaller but still big
enough.
-@@ -3243,6 +3276,7 @@ static struct alloc_handle *_alloc_init(
+@@ -3355,6 +3388,7 @@ static struct alloc_handle *_alloc_init(struct
cmd_context *cmd,
ah->parity_count = parity_count;
ah->region_size = region_size;
ah->alloc = alloc;
@@ -145,7 +148,7 @@
/*
* For the purposes of allocation, area_count and parity_count are
-@@ -3254,6 +3288,7 @@ static struct alloc_handle *_alloc_init(
+@@ -3366,6 +3400,7 @@ static struct alloc_handle *_alloc_init(struct
cmd_context *cmd,
ah->area_multiple = _calc_area_multiple(segtype, area_count +
parity_count, stripes);
//FIXME: s/mirror_logs_separate/metadata_separate/ so it can be used by
others?
ah->mirror_logs_separate = find_config_tree_bool(cmd,
allocation_mirror_logs_require_separate_pvs_CFG, NULL);
@@ -153,18 +156,24 @@
if (mirrors || stripes)
total_extents = new_extents;
-Index: LVM2.2.02.165/man/lvcreate.8.in
-===================================================================
---- LVM2.2.02.165.orig/man/lvcreate.8.in
-+++ LVM2.2.02.165/man/lvcreate.8.in
-@@ -418,6 +418,10 @@ Using \fBcore\fP means the mirror is reg
- from the first device each time the logical volume is activated,
- like after every reboot.
+diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
+index 6663087..c385927 100644
+--- a/man/lvcreate.8_pregen
++++ b/man/lvcreate.8_pregen
+@@ -416,6 +416,13 @@ Create a raid10 LV.
+ [ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
+ .ad b
.br
+Every leg of the mirrored logical volume could be placed on the pvs with
+same tag, see details(mirror_legs_require_separate_pvs) in lvm.conf.
+
+.br
- Using \fBmirrored\fP will create a persistent log that is itself mirrored.
- .
- .HP
++Using \fBmirrored\fP will create a persistent log that is itself mirrored.
++.
++.HP
+ .ad l
+ [ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ]
+ .ad b
+--
+2.10.2
+
