[lvm2] New upstream & update /var dirs for systemd.

Tue Jan 18 00:11:03 UTC 2011

commit 16c802baf1f8f7eac376fb5911e962441603f912
Author: Alasdair G Kergon <agk at redhat.com>
Date:   Tue Jan 18 00:09:35 2011 +0000

    New upstream & update /var dirs for systemd.

 .gitignore           |    1 +
 LVM2.2.02.79.tgz.asc |    7 -----
 LVM2.2.02.81.tgz.asc |    7 +++++
 lvm2-tmpfiles.conf   |    2 +
 lvm2.spec            |   61 +++++++++++++++++++++++++++++++++++++++----------
 sources              |    2 +-
 upstream             |    2 +-
 7 files changed, 60 insertions(+), 22 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index a80161b..6ecf5ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ LVM2.2.02.73.tgz
 /LVM2.2.02.77.tgz
 /LVM2.2.02.78.tgz
 /LVM2.2.02.79.tgz
+/LVM2.2.02.81.tgz
diff --git a/LVM2.2.02.81.tgz.asc b/LVM2.2.02.81.tgz.asc
new file mode 100644
index 0000000..782c32a
--- /dev/null
+++ b/LVM2.2.02.81.tgz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.1 (GNU/Linux)
+
+iD8DBQBNNIbIIoGRwVZ+LBcRAqCzAKDm8+SXBMgBRCmCWz7ZjgK3Pd53egCeP7/v
+fP0oRnLgcuCwyltrKpKXpgs=
+=VwAU
+-----END PGP SIGNATURE-----
diff --git a/lvm2-tmpfiles.conf b/lvm2-tmpfiles.conf
new file mode 100644
index 0000000..6e76fcb
--- /dev/null
+++ b/lvm2-tmpfiles.conf
@@ -0,0 +1,2 @@
+D /var/lock/lvm 0700 root root -
+D /var/run/lvm 0700 root root -
diff --git a/lvm2.spec b/lvm2.spec
index e37d2de..bc7d599 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,4 +1,4 @@
-%define device_mapper_version 1.02.60
+%define device_mapper_version 1.02.61
 %define enable_cluster 1
 
 %if "%{fedora}" == "12"
@@ -29,12 +29,13 @@
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.79
+Version: 2.02.81
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
 Source0: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
+Source1: %{name}-tmpfiles.conf
 Patch0: lvm2-set-default-preferred_names.patch
 
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
@@ -51,6 +52,7 @@ BuildRequires: pkgconfig
 BuildRequires: libudev-devel
 %endif
 Requires: %{name}-libs = %{version}-%{release}
+Requires: initscripts
 Requires: module-init-tools
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -87,6 +89,8 @@ make %{?_smp_mflags}
 make install DESTDIR=$RPM_BUILD_ROOT
 make install_system_dirs DESTDIR=$RPM_BUILD_ROOT
 make install_initscripts DESTDIR=$RPM_BUILD_ROOT
+mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
+install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -202,15 +206,16 @@ fi
 %if %{enable_udev}
 %{_udevdir}/11-dm-lvm.rules
 %endif
-%dir /etc/lvm
-%ghost /etc/lvm/cache/.cache
-%config(noreplace) %verify(not md5 mtime size) /etc/lvm/lvm.conf
-%dir /etc/lvm/backup
-%dir /etc/lvm/cache
-%dir /etc/lvm/archive
-%dir /var/lock/lvm
-%ghost /var/run/lvm
-/etc/rc.d/init.d/lvm2-monitor
+%dir %{_sysconfdir}/lvm
+%ghost %{_sysconfdir}/lvm/cache/.cache
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/lvm.conf
+%dir %{_sysconfdir}/lvm/backup
+%dir %{_sysconfdir}/lvm/cache
+%dir %{_sysconfdir}/lvm/archive
+%dir %{_localstatedir}/lock/lvm
+%dir %{_localstatedir}/run/lvm
+%{_sysconfdir}/rc.d/init.d/lvm2-monitor
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
 
 ##############################################################################
 # Library and Development subpackages
@@ -296,7 +301,9 @@ fi
 %defattr(-,root,root,-)
 %attr(755,root,root) /usr/sbin/clvmd
 %{_mandir}/man8/clvmd.8.gz
-/etc/rc.d/init.d/clvmd
+%{_sysconfdir}/rc.d/init.d/clvmd
+#%ghost %{_localstatedir}/run/lvm/clvmd.sock
+#%ghost %{_localstatedir}/run/clvmd.pid
 
 %endif
 
@@ -329,7 +336,8 @@ fi
 %defattr(-,root,root,-)
 %attr(755,root,root) /usr/sbin/cmirrord
 %{_mandir}/man8/cmirrord.8.gz
-/etc/rc.d/init.d/cmirrord
+%{_sysconfdir}/rc.d/init.d/cmirrord
+#%ghost %{_localstatedir}/run/cmirrord.pid
 
 %endif
 
@@ -424,6 +432,7 @@ of device-mapper devices.
 %defattr(-,root,root,-)
 %{_sbindir}/dmeventd
 %{_mandir}/man8/dmeventd.8.gz
+#%ghost %{_localstatedir}/run/dmeventd.pid
 
 %package -n device-mapper-event-libs
 Summary: Device-mapper event daemon shared library
@@ -442,6 +451,8 @@ libdevmapper-event.
 
 %files -n device-mapper-event-libs
 %attr(755,root,root) %{_libdir}/libdevmapper-event.so.*
+#%ghost %{_localstatedir}/run/dmeventd-client
+#%ghost %{_localstatedir}/run/dmeventd-server
 
 %package -n device-mapper-event-devel
 Summary: Development libraries and headers for the device-mapper event daemon
@@ -464,6 +475,30 @@ the device-mapper event library.
 
 
 %changelog
+* Mon Jan 17 2011 Alasdair Kergon <agk at redhat.com> - 2.02.81-1
+- Add disk to allowed mirrored log type conversions.
+- Accept fusion fio in device type filter.
+- Speed up command processing by caching resolved config tree.
+- Use same dm cookie for consecutive dm ops in same VG to reduce udev waits.
+- Do not scan devices in dev_reset_error_count() when forking.
+- Skip unnecessary LOCK_NULL unlock call during volume deactivation.
+- Skip fs_unlock when calling exec_cmd within activation code (for modprobe).
+- Replace fs_unlock by sync_local_dev_names to notify local clvmd. (2.02.80)
+- Fix wrongly paired unlocking of VG_GLOBAL in pvchange. (2.02.66)
+- Return 0 from cmirrord initscript 'start' if daemon is already running.
+- Add DM_COOKIE_AUTO_CREATE to libdevmapper.h.
+- Improve general lvconvert man page description.
+- Detect NULL handle in get_property().
+- Fix memory leak in persistent filter creation error path.
+- Check for errors setting up dm_task struct in _setup_task().
+- Fail polldaemon creation when lvmcache_init() fails.
+- Return PERCENT_INVALID for errors in _copy_percent() and _snap_percent().
+- Detect errors from dm_task_set calls in _get_device_info (dmeventd).
+- Fix memory leak in debug mode of restart_clvmd() error path.
+- Log error message for pthread_join() failure in clvmd.
+- Use tmpfiles.d/lvm2.conf to create /var/lock/lvm and /var/run/lvm at boot.
+- Require initscripts for tmpfiles.d/lvm2.conf.
+
 * Tue Dec 21 2010 Alasdair Kergon <agk at redhat.com> - 2.02.79-1
 - Create /var/run/lvm directory during clvmd initialisation if missing.
 - Avoid revalidating the label cache immediately after scanning.
diff --git a/sources b/sources
index da5d567..3d0f128 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6929251a90b0b626c024942a242f337  LVM2.2.02.79.tgz
+0359eef82a9d9551489f8a104ef22a69  LVM2.2.02.81.tgz
diff --git a/upstream b/upstream
index 3091a31..5b80a12 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-LVM2.2.02.79.tgz
+LVM2.2.02.81.tgz
