diff --git a/device-mapper.changes b/device-mapper.changes index 2eaac4a..c252484 100644 --- a/device-mapper.changes +++ b/device-mapper.changes @@ -3,8 +3,8 @@ Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com - Split configure options to have one per line - Pass over with spec-cleaner -- Add the dlm_version and sandlock_version to common defs, to be - used later on +- Enable internal cache +- Enable lvmpolld ------------------------------------------------------------------- Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com diff --git a/device-mapper.spec b/device-mapper.spec index d3d0bc7..3a6c41b 100644 --- a/device-mapper.spec +++ b/device-mapper.spec @@ -22,8 +22,6 @@ %define lvm2_version 2.02.168 %define device_mapper_version 1.02.137 %define thin_provisioning_version 0.5.6 -%define dlm_version 3.99.1 -%define sanlock_version 3.3.0 ### COMMON-DEF-END ### Name: device-mapper Version: %{device_mapper_version} diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes index 2eaac4a..c252484 100644 --- a/lvm2-clvm.changes +++ b/lvm2-clvm.changes @@ -3,8 +3,8 @@ Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com - Split configure options to have one per line - Pass over with spec-cleaner -- Add the dlm_version and sandlock_version to common defs, to be - used later on +- Enable internal cache +- Enable lvmpolld ------------------------------------------------------------------- Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec index 8550b88..4df50ce 100644 --- a/lvm2-clvm.spec +++ b/lvm2-clvm.spec @@ -20,8 +20,6 @@ %define lvm2_version 2.02.168 %define device_mapper_version 1.02.137 %define thin_provisioning_version 0.5.6 -%define dlm_version 3.99.1 -%define sanlock_version 3.3.0 ### COMMON-DEF-END ### Name: lvm2-clvm Version: %{lvm2_version} diff --git a/lvm2.changes b/lvm2.changes index 2eaac4a..c252484 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -3,8 +3,8 @@ Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com - Split configure options to have one per line - Pass over with spec-cleaner -- Add the dlm_version and sandlock_version to common defs, to be - used later on +- Enable internal cache +- Enable lvmpolld ------------------------------------------------------------------- Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com diff --git a/lvm2.spec b/lvm2.spec index 7f7e2b2..5cb5c6d 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -23,8 +23,6 @@ %define lvm2_version 2.02.168 %define device_mapper_version 1.02.137 %define thin_provisioning_version 0.5.6 -%define dlm_version 3.99.1 -%define sanlock_version 3.3.0 ### COMMON-DEF-END ### Name: lvm2 Version: %{lvm2_version} @@ -151,11 +149,13 @@ Volume Manager. %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 @@ -213,6 +213,7 @@ popd 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 @@ done 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 @@ popd %{?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,6 +275,7 @@ popd %{_sbindir}/lvmconfig %{_sbindir}/lvmdump %{_sbindir}/lvmetad +%{_sbindir}/lvmpolld # Other files %{_sbindir}/lvchange %{_sbindir}/lvconvert @@ -320,6 +322,7 @@ popd %{_sbindir}/vgsplit %{_sbindir}/rcblk-availability %{_sbindir}/rclvm2-lvmetad +%{_sbindir}/rclvm2-lvmpolld %{_sbindir}/rclvm2-monitor # compat symlinks in /sbin /sbin/lvm @@ -327,6 +330,7 @@ popd /sbin/lvmconfig /sbin/lvmdump /sbin/lvmetad +/sbin/lvmpolld /sbin/lvchange /sbin/lvconvert /sbin/lvcreate @@ -429,8 +433,9 @@ popd %{_mandir}/man8/vgscan.8%{ext_man} %{_mandir}/man8/vgsplit.8%{ext_man} %{_mandir}/man8/lvmetad.8%{ext_man} -%{_mandir}/man8/lvm-lvpoll.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,6 +461,8 @@ popd %{_unitdir}/lvm2-lvmetad.socket %{_unitdir}/lvm2-lvmetad.service %{_unitdir}/lvm2-pvscan@.service +%{_unitdir}/lvm2-lvmpolld.socket +%{_unitdir}/lvm2-lvmpolld.service %{_prefix}/lib/systemd/system-generators/lvm2-activation-generator %dir %{_libdir}/device-mapper %{_libdir}/device-mapper/libdevmapper-event-lvm2*.so