- updated to 2.02.116

- killed systemd infestation

diff --git a/clvmd.service b/clvmd.service
deleted file mode 100644 (file)
index f75c272..0000000
--- a/clvmd.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=cluster LVM daemon
-After=syslog.target network.target corosync.service dlm.service
-Requires=dlm.service
-
-[Service]
-Type=notify
-NotifyAccess=main
-EnvironmentFile=/etc/sysconfig/clvmd
-ExecStart=/usr/sbin/clvmd -f $CLVMDOPTS
-ExecReload=/usr/sbin/clvmd -R
-
-[Install]
-WantedBy=multi-user.target

diff --git a/lvm2-sd_notify.patch b/lvm2-sd_notify.patch
deleted file mode 100644 (file)
index 144523b..0000000
--- a/lvm2-sd_notify.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -dur LVM2.2.02.98.orig/daemons/clvmd/Makefile.in LVM2.2.02.98/daemons/clvmd/Makefile.in
---- LVM2.2.02.98.orig/daemons/clvmd/Makefile.in        2012-10-15 16:24:58.000000000 +0200
-+++ LVM2.2.02.98/daemons/clvmd/Makefile.in     2012-11-01 18:35:19.000000000 +0100
-@@ -90,6 +90,8 @@
- DEFS += -D_REENTRANT
- CFLAGS += -fno-strict-aliasing
- 
-+LIBS += `pkg-config --libs libsystemd-daemon`
-+
- INSTALL_TARGETS = \
-       install_clvmd
- 
-diff -dur LVM2.2.02.98.orig/daemons/clvmd/clvmd.c LVM2.2.02.98/daemons/clvmd/clvmd.c
---- LVM2.2.02.98.orig/daemons/clvmd/clvmd.c    2012-10-15 16:24:58.000000000 +0200
-+++ LVM2.2.02.98/daemons/clvmd/clvmd.c 2012-11-01 18:34:20.000000000 +0100
-@@ -41,6 +41,8 @@
- #include <sys/un.h>
- #include <sys/utsname.h>
- 
-+#include <systemd/sd-daemon.h>
-+
- #ifndef TRUE
- #define TRUE 1
- #endif
-@@ -599,6 +601,7 @@
-               clops->cluster_init_completed();
- 
-       DEBUGLOG("clvmd ready for work\n");
-+      sd_notify(0, "READY=1");
-       child_init_signal(SUCCESS);
- 
-       /* Try to shutdown neatly */

diff --git a/lvm2.spec b/lvm2.spec
index f50ac8bcaea68ea49a4b2ffb3c9a5d559a38f38c..2565a569915a50b2a9fce5bf20a3e28385a30671 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -33,14 +33,13 @@
 Summary:       The new version of Logical Volume Manager for Linux
 Summary(pl.UTF-8):     Nowa wersja Logical Volume Managera dla Linuksa
 Name:          lvm2
-Version:       2.02.111
+Version:       2.02.116
 Release:       1
 License:       GPL v2 and LGPL v2.1
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5: 02487ab2a9e02d1ee76fe217183df28a
+# Source0-md5: 3a1104e3d1dc4d5e92a40228161cd660
 Source1:       %{name}-tmpfiles.conf
-Source2:       clvmd.service
 Source3:       clvmd.sysconfig
 Patch0:                %{name}-selinux.patch
 Patch1:                %{name}-diet.patch
@@ -48,9 +47,8 @@ Patch2:               device-mapper-dmsetup-export.patch
 Patch3:                %{name}-tld_init.patch
 Patch4:                dl-dlsym.patch
 Patch6:                %{name}-lvm_path.patch
-Patch7:                %{name}-sd_notify.patch
-Patch8:                %{name}-clvmd_cmd_timeout.patch
-Patch9:                device-mapper-dmsetup-deps-export.patch
+Patch7:                %{name}-clvmd_cmd_timeout.patch
+Patch8:                device-mapper-dmsetup-deps-export.patch
 URL:           http://sources.redhat.com/lvm2/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
@@ -76,13 +74,10 @@ BuildConflicts:     device-mapper-dietlibc
 %if %{with cluster}
 BuildRequires: corosync-devel
 BuildRequires: dlm-devel >= 3.99.5
-BuildRequires: systemd-devel
 %endif
-Requires(post,preun,postun):   systemd-units >= 38
 Requires(post,postun): /sbin/chkconfig
 Requires:      device-mapper >= %{version}-%{release}
 %{?with_selinux:Requires:      libselinux >= 1.10}
-Requires:      systemd-units >= 38
 # doesn't work with 2.4 kernels
 Requires:      uname(release) >= 2.6
 Obsoletes:     lvm
@@ -179,8 +174,6 @@ Summary:    Userspace support for the device-mapper
 Summary(pl.UTF-8):     Wsparcie dla mapowania urządzeń w przestrzeni użytkownika
 Group:         Base
 Requires(post,postun): /sbin/ldconfig
-Requires(post,preun,postun):   systemd-units >= 38
-Requires:      systemd-units >= 38
 
 %description -n device-mapper
 The goal of this driver is to support volume management. The driver
@@ -277,7 +270,6 @@ potrzeby initrd.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 # do not force --export-symbol linker option for e.g. statically linked executables
 # -rdynamic compiler option drives linker in the right way.
@@ -337,6 +329,7 @@ unset CC
 %endif
 
 %configure \
+       --disable-udev-systemd-background-jobs \
        --enable-applib \
        --enable-cmdlib \
        %{?debug:--enable-debug} \
@@ -361,7 +354,6 @@ unset CC
        --with-optimisation="%{rpmcflags}" \
        --with-pool=internal \
        --with-snapshots=internal \
-       --with-systemdsystemunitdir=%{systemdunitdir} \
        --with-thin=internal \
        --with-thin-check=%{_sbindir}/thin_check \
        --with-thin-dump=%{_sbindir}/thin_dump \
@@ -377,7 +369,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/lvm,/etc/sysconfig}
 %{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
 
-%{__make} install install_system_dirs install_systemd_units install_initscripts \
+%{__make} install install_system_dirs install_initscripts \
        DESTDIR=$RPM_BUILD_ROOT \
        OWNER="" \
        GROUP=""
@@ -386,7 +378,6 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
 
 %if %{with cluster}
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/clvmd.service
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/clvmd
 %endif
 
@@ -415,14 +406,7 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/chkconfig --add lvm2-monitor
 %service lvm2-monitor restart
-%systemd_post lvm2-monitor.service
 /sbin/chkconfig --add blk-availability
-# no service blk-availability restart
-%systemd_post blk-availability.service
-
-%preun
-%systemd_preun lvm2-monitor.service
-%systemd_preun blk-availability.service
 
 %postun
 if [ "$1" = "0" ]; then
@@ -431,42 +415,25 @@ if [ "$1" = "0" ]; then
        #no service blk-availability stop
        /sbin/chkconfig --del blk-availability
 fi
-%systemd_reload
-
-%triggerpostun -- %{name} < 2.02.94-1
-%systemd_trigger lvm2-monitor.service
 
 %post -n device-mapper
 /sbin/ldconfig
-%systemd_post dm-event.socket
-
-%preun -n device-mapper
-%systemd_preun dm-event.socket dm-event.service
 
 %postun -n device-mapper
 /sbin/ldconfig
-%systemd_reload
-
-%triggerpostun -n device-mapper -- device-mapper < 2.02.94-1
-%systemd_trigger dm-event.socket
 
 %post clvmd
 /sbin/chkconfig --add clvmd
 # no service restart - it breaks current locks!
 export NORESTART=1
-%systemd_post clvmd.service
 # re-exec instead
 /usr/sbin/clvmd -S 2>/dev/null || :
 
-%preun clvmd
-%systemd_preun clvmd.service
-
 %postun clvmd
 if [ "$1" = "0" ]; then
        %service clvmd stop
        /sbin/chkconfig --del clvmd
 fi
-%systemd_reload
 
 %files
 %defattr(644,root,root,755)
@@ -494,13 +461,6 @@ fi
 /lib/udev/rules.d/69-dm-lvm-metad.rules
 %endif
 %{_sysconfdir}/tmpfiles.d/lvm2.conf
-%{systemdunitdir}/blk-availability.service
-%if %{with lvmetad}
-%{systemdunitdir}/lvm2-lvmetad.service
-%{systemdunitdir}/lvm2-lvmetad.socket
-%endif
-%{systemdunitdir}/lvm2-monitor.service
-%{systemdunitdir}/lvm2-pvscan@.service
 %dir %{_sysconfdir}/lvm/cache
 %ghost %{_sysconfdir}/lvm/cache/.cache
 %attr(754,root,root) /etc/rc.d/init.d/blk-availability
@@ -516,17 +476,12 @@ fi
 %attr(755,root,root) %{_usrsbindir}/clvmd
 %attr(754,root,root) /etc/rc.d/init.d/clvmd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/clvmd
-%attr(755,root,root) /lib/systemd/lvm2-cluster-activation
-%{systemdunitdir}/clvmd.service
-%{systemdunitdir}/lvm2-cluster-activation.service
-%{systemdunitdir}/lvm2-clvmd.service
 %{_mandir}/man8/clvmd.8*
 
 %files cmirrord
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_usrsbindir}/cmirrord
 %attr(754,root,root) /etc/rc.d/init.d/cmirrord
-%{systemdunitdir}/lvm2-cmirrord.service
 %{_mandir}/man8/cmirrord.8*
 %endif
 
@@ -538,8 +493,6 @@ fi
 %files -n device-mapper
 %defattr(644,root,root,755)
 %doc *_DM
-%{systemdunitdir}/dm-event.service
-%{systemdunitdir}/dm-event.socket
 /lib/udev/rules.d/10-dm.rules
 /lib/udev/rules.d/11-dm-lvm.rules
 /lib/udev/rules.d/13-dm-disk.rules