master - configure: set optimize flags when CFLAGS is unset
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3fa66d103652df...
Commit: 3fa66d103652df217059e2629da816adb9599e7c
Parent: f207a6d353c895c6078f8345340228a2a790a659
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed May 13 21:30:20 2015 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu May 14 00:19:33 2015 +0200
configure: set optimize flags when CFLAGS is unset
If we are given CFLAGS - preserve user's request and avoid placing
just -O2 there.
---
configure | 6 +++---
configure.in | 4 +---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index 9485c2b..c4d714b 100755
--- a/configure
+++ b/configure
@@ -3033,10 +3033,11 @@ test -n "$target_alias" &&
NONENONEs,x,x, &&
program_prefix=${target_alias}-
+if test -z "$CFLAGS"; then :
+ COPTIMISE_FLAG="-O2"
+fi
case "$host_os" in
linux*)
- CFLAGS="$CFLAGS"
- COPTIMISE_FLAG="-O2"
CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
ELDFLAGS="-Wl,--export-dynamic"
# FIXME Generate list and use --dynamic-list=.dlopen.sym
@@ -3056,7 +3057,6 @@ case "$host_os" in
;;
darwin*)
CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
- COPTIMISE_FLAG="-O2"
CLDFLAGS="$CLDFLAGS"
ELDFLAGS=
CLDWHOLEARCHIVE="-all_load"
diff --git a/configure.in b/configure.in
index 5933763..161f832 100644
--- a/configure.in
+++ b/configure.in
@@ -26,10 +26,9 @@ AC_CONFIG_AUX_DIR(autoconf)
dnl -- Get system type
AC_CANONICAL_TARGET([])
+AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"])
case "$host_os" in
linux*)
- CFLAGS="$CFLAGS"
- COPTIMISE_FLAG="-O2"
CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
ELDFLAGS="-Wl,--export-dynamic"
# FIXME Generate list and use --dynamic-list=.dlopen.sym
@@ -49,7 +48,6 @@ case "$host_os" in
;;
darwin*)
CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
- COPTIMISE_FLAG="-O2"
CLDFLAGS="$CLDFLAGS"
ELDFLAGS=
CLDWHOLEARCHIVE="-all_load"
9 years
master - configure: preserve CXX/CFLAGS
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f207a6d353c895...
Commit: f207a6d353c895c6078f8345340228a2a790a659
Parent: 5e38b8439a48c5d3e7a9624336e1a4ae73049717
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed May 13 21:23:24 2015 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu May 14 00:19:32 2015 +0200
configure: preserve CXX/CFLAGS
AC_PROG_CC
AC_PROG_CXX
Does not preserve CFLAGS CXXFLAGS
---
configure | 4 ++++
configure.in | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/configure b/configure
index 9babc59..9485c2b 100755
--- a/configure
+++ b/configure
@@ -3184,6 +3184,8 @@ fi
test -n "$AWK" && break
done
+save_CFLAGS=$CFLAGS
+save_CXXFLAGS=$CXXFLAGS
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4230,6 +4232,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+CFLAGS=$save_CFLAGS
+CXXFLAGS=$save_CXXFLAGS
ac_ext=c
diff --git a/configure.in b/configure.in
index c3222ed..5933763 100644
--- a/configure.in
+++ b/configure.in
@@ -69,8 +69,12 @@ esac
dnl -- Checks for programs.
AC_PROG_SED
AC_PROG_AWK
+save_CFLAGS=$CFLAGS
+save_CXXFLAGS=$CXXFLAGS
AC_PROG_CC
AC_PROG_CXX
+CFLAGS=$save_CFLAGS
+CXXFLAGS=$save_CXXFLAGS
dnl probably no longer needed in 2008, but...
AC_PROG_GCC_TRADITIONAL
9 years
master - nix: fix socat package name
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5e38b8439a48c5...
Commit: 5e38b8439a48c5d3e7a9624336e1a4ae73049717
Parent: a8fc483ca4914ddc67b7831150f1ee4c3c429ec1
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed May 13 21:22:08 2015 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu May 14 00:19:32 2015 +0200
nix: fix socat package name
---
nix/default.nix | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/nix/default.nix b/nix/default.nix
index 6b0001e..b3acc0e 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -357,7 +357,7 @@ let
"perl-GD" # for lcov
"mdadm" # for tests with lvm2 and mdadm
"device-mapper-persistent-data" # thin and cache
- "sockat # used by test suite lvmpolld
+ "socat" # used by test suite lvmpolld
"kernel"
];
centos63 = [ "clusterlib-devel" "openaislib-devel" "cman" "libudev-devel" "procps" ];
9 years
master - makefiles: use fullpath when in assign
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a8fc483ca4914d...
Commit: a8fc483ca4914ddc67b7831150f1ee4c3c429ec1
Parent: 7bd1559db62ce5986da806424a193a25965f5fdc
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed May 13 15:43:55 2015 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu May 14 00:19:32 2015 +0200
makefiles: use fullpath when in assign
We need to put full path right in the assign moment,
otherwise command:
make rpm rpmbuild=/my/tmp/dir
cannot work as one would have expected.
---
Makefile.in | 3 ++-
make.tmpl.in | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index be4241c..43a6ed0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,6 +93,7 @@ cscope.out:
all: cscope.out
endif
DISTCLEAN_TARGETS += cscope.out
+CLEAN_DIRS += autom4te.cache
check check_system check_cluster check_local check_lvmetad unit: all
$(MAKE) -C test $(@)
@@ -125,7 +126,7 @@ rpm: dist
-e "s,^\(Version:[^0-9%]*\)[0-9.]*$$,\1 $(LVM_VER)," \
-e "s,^\(Release:[^0-9%]*\)[0-9.]\+,\1 $$GIT_VER," \
$(top_srcdir)/spec/source.inc >$(rpmbuilddir)/SOURCES/source.inc
- rpmbuild -v --define "_topdir $(abs_top_builddir)/$(rpmbuilddir)" -ba $(top_srcdir)/spec/lvm2.spec
+ rpmbuild -v --define "_topdir $(rpmbuilddir)" -ba $(top_srcdir)/spec/lvm2.spec
generate: conf.generate
$(MAKE) -C conf generate
diff --git a/make.tmpl.in b/make.tmpl.in
index d85dd69..1aae6a2 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -116,7 +116,7 @@ vpath %.exported_symbols $(srcdir)
interface = @interface@
interfacebuilddir = $(top_builddir)/libdm/$(interface)
-rpmbuilddir = build
+rpmbuilddir = $(abs_top_builddir)/build
# The number of jobs to run, if blank, defaults to the make standard
ifndef MAKEFLAGS
9 years
master - makefiles: testclient is not valid target
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7bd1559db62ce5...
Commit: 7bd1559db62ce5986da806424a193a25965f5fdc
Parent: ea846f1ca2910f03d66e2859b8189a215b3d8d4c
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed May 13 14:22:46 2015 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu May 14 00:19:32 2015 +0200
makefiles: testclient is not valid target
---
daemons/lvmetad/Makefile.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/daemons/lvmetad/Makefile.in b/daemons/lvmetad/Makefile.in
index 0a174bb..f9b997e 100644
--- a/daemons/lvmetad/Makefile.in
+++ b/daemons/lvmetad/Makefile.in
@@ -18,7 +18,7 @@ top_builddir = @top_builddir@
SOURCES = lvmetad-core.c
SOURCES2 = testclient.c
-TARGETS = lvmetad lvmetad-testclient
+TARGETS = lvmetad
.PHONY: install_lvmetad
9 years
master - makefiles: drop way too generic deps
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ea846f1ca2910f...
Commit: ea846f1ca2910f03d66e2859b8189a215b3d8d4c
Parent: 02e10f4ccd60f66a00d5406452459317baba7c62
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed May 13 14:22:18 2015 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu May 14 00:19:32 2015 +0200
makefiles: drop way too generic deps
---
make.tmpl.in | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/make.tmpl.in b/make.tmpl.in
index dce5b2c..d85dd69 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -398,8 +398,6 @@ cflow: $(CFLOW_TARGET).cflow $(CFLOW_TARGET).tree $(CFLOW_TARGET).rxref $(CFLOW_
endif
endif
-$(TARGETS): $(OBJECTS)
-
%.o: %.c
$(CC) -c $(INCLUDES) $(DEFS) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
9 years
master - libdaemon: Fix socket reuse error paths.
by Alasdair Kergon
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=02e10f4ccd60f6...
Commit: 02e10f4ccd60f66a00d5406452459317baba7c62
Parent: cc560b75aa5144ce6859e6d0ecc4cb918af7f4d8
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: Wed May 13 13:42:09 2015 +0100
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: Wed May 13 13:42:09 2015 +0100
libdaemon: Fix socket reuse error paths.
Invert S_ISSOCK validation.
Fail instead of replacing a symlink with a new socket.
After failure, skip calling fcntl with invalid socket_fd.
---
WHATS_NEW | 1 +
libdaemon/server/daemon-server.c | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index e1674e2..e92c01a 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.120 -
===============================
+ Fix some libdaemon socket creation and reuse error paths.
Daemons (libdaemon) support exit on idle also in non-systemd environment.
Provide make dist and make rpm targets
Configure lvm.conf for use_lvmetad and use_lvmpolld.
diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
index 5b1aff1..e1a9da9 100644
--- a/libdaemon/server/daemon-server.c
+++ b/libdaemon/server/daemon-server.c
@@ -261,12 +261,12 @@ static int _open_socket(daemon_state s)
}
/* Socket already exists. If it's stale, remove it. */
- if (stat(sockaddr.sun_path, &buf)) {
+ if (lstat(sockaddr.sun_path, &buf)) {
perror("stat failed");
goto error;
}
- if (S_ISSOCK(buf.st_mode)) {
+ if (!S_ISSOCK(buf.st_mode)) {
fprintf(stderr, "%s: not a socket\n", sockaddr.sun_path);
goto error;
}
@@ -595,7 +595,7 @@ void daemon_start(daemon_state s)
}
/* Set Close-on-exec */
- if (fcntl(s.socket_fd, F_SETFD, 1))
+ if (!failed && fcntl(s.socket_fd, F_SETFD, 1))
fprintf(stderr, "setting CLOEXEC on socket fd %d failed: %s\n", s.socket_fd, strerror(errno));
/* Signal parent, letting them know we are ready to go. */
9 years
master - configure: start to use AS_IF
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=cc560b75aa5144...
Commit: cc560b75aa5144ce6859e6d0ecc4cb918af7f4d8
Parent: 007ac0d36f2430a7a9048e2bc7f20cb5a204c413
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue May 12 14:46:36 2015 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed May 13 13:19:36 2015 +0200
configure: start to use AS_IF
---
configure | 16 ++++++++++++----
configure.in | 12 ++++++++----
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index 7c1ffe0..9babc59 100755
--- a/configure
+++ b/configure
@@ -14603,14 +14603,22 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-test -n "$THIN_CONFIGURE_WARN" && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Support for thin provisioning is limited since some thin provisioning tools are missing!" >&5
+if test -n "$THIN_CONFIGURE_WARN"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Support for thin provisioning is limited since some thin provisioning tools are missing!" >&5
$as_echo "$as_me: WARNING: Support for thin provisioning is limited since some thin provisioning tools are missing!" >&2;}
+fi
-test -n "$THIN_CHECK_VERSION_WARN" && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You should also install thin_check vsn 0.3.2 (or later) to use lvm2 thin provisioning" >&5
+if test -n "$THIN_CHECK_VERSION_WARN"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You should also install thin_check vsn 0.3.2 (or later) to use lvm2 thin provisioning" >&5
$as_echo "$as_me: WARNING: You should also install thin_check vsn 0.3.2 (or later) to use lvm2 thin provisioning" >&2;}
+fi
-test -n "$CACHE_CONFIGURE_WARN" && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Support for cache is limited since some cache tools are missing!" >&5
+if test -n "$CACHE_CONFIGURE_WARN"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Support for cache is limited since some cache tools are missing!" >&5
$as_echo "$as_me: WARNING: Support for cache is limited since some cache tools are missing!" >&2;}
+fi
-test "$ODIRECT" = yes || { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: O_DIRECT disabled: low-memory pvmove may lock up" >&5
+if test "$ODIRECT" != yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: O_DIRECT disabled: low-memory pvmove may lock up" >&5
$as_echo "$as_me: WARNING: O_DIRECT disabled: low-memory pvmove may lock up" >&2;}
+fi
diff --git a/configure.in b/configure.in
index 83358f5..c3222ed 100644
--- a/configure.in
+++ b/configure.in
@@ -1955,10 +1955,14 @@ unit-tests/mm/Makefile
])
AC_OUTPUT
-test -n "$THIN_CONFIGURE_WARN" && AC_MSG_WARN([Support for thin provisioning is limited since some thin provisioning tools are missing!])
+AS_IF([test -n "$THIN_CONFIGURE_WARN"],
+ [AC_MSG_WARN([Support for thin provisioning is limited since some thin provisioning tools are missing!])])
-test -n "$THIN_CHECK_VERSION_WARN" && AC_MSG_WARN([You should also install thin_check vsn 0.3.2 (or later) to use lvm2 thin provisioning])
+AS_IF([test -n "$THIN_CHECK_VERSION_WARN"],
+ [AC_MSG_WARN([You should also install thin_check vsn 0.3.2 (or later) to use lvm2 thin provisioning])])
-test -n "$CACHE_CONFIGURE_WARN" && AC_MSG_WARN([Support for cache is limited since some cache tools are missing!])
+AS_IF([test -n "$CACHE_CONFIGURE_WARN"],
+ [AC_MSG_WARN([Support for cache is limited since some cache tools are missing!])])
-test "$ODIRECT" = yes || AC_MSG_WARN([O_DIRECT disabled: low-memory pvmove may lock up])
+AS_IF([test "$ODIRECT" != yes],
+ [AC_MSG_WARN([O_DIRECT disabled: low-memory pvmove may lock up])])
9 years
master - nix: more base packages
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=007ac0d36f2430...
Commit: 007ac0d36f2430a7a9048e2bc7f20cb5a204c413
Parent: 1b43d633688c5bc30cef8bc82f5db6a4fa1abeb6
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue May 12 14:33:14 2015 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed May 13 13:19:35 2015 +0200
nix: more base packages
---
nix/default.nix | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/nix/default.nix b/nix/default.nix
index b1693af..6b0001e 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -351,23 +351,25 @@ let
install_rpms = rec {
common = [ "libselinux-devel" "libsepol-devel" "ncurses-devel" "readline-devel"
- "valgrind" "gdb" "strace"
+ "valgrind" "valgrind-devel" "gdb" "strace"
"redhat-rpm-config" # needed for rpmbuild of lvm
"which" "e2fsprogs" # needed for fsadm
"perl-GD" # for lcov
"mdadm" # for tests with lvm2 and mdadm
+ "device-mapper-persistent-data" # thin and cache
+ "sockat # used by test suite lvmpolld
"kernel"
];
- centos63 = [ "clusterlib-devel" "openaislib-devel" "cman" "libudev-devel" "valgrind-devel" "procps" ];
+ centos63 = [ "clusterlib-devel" "openaislib-devel" "cman" "libudev-devel" "procps" ];
centos64 = centos63 ++ [ "corosynclib-devel" ];
centos65 = centos64;
centos66 = centos65;
centos70 = [ "dlm-devel" "dlm" "corosynclib-devel" "perl-Digest-MD5" "systemd-devel"
- "device-mapper-persistent-data" "procps-ng" "valgrind-devel" ];
+ "procps-ng" ];
fedora17 = fedora18 ++ [ "libudev-devel" ];
- fedora18 = [ "dlm-devel" "corosynclib-devel" "device-mapper-persistent-data"
+ fedora18 = [ "dlm-devel" "corosynclib-devel"
"dlm" "systemd-devel" "perl-Digest-MD5" "kernel-modules-extra" ];
fedora18u = fedora18;
9 years
master - spec: packaging polld
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1b43d633688c5b...
Commit: 1b43d633688c5bc30cef8bc82f5db6a4fa1abeb6
Parent: d5cef7413fb63f42eadb9b1897194f5c2f07ef30
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed May 13 13:14:54 2015 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed May 13 13:18:59 2015 +0200
spec: packaging polld
Package lvmpolld
Drop legacy SysV init subpackage.
---
spec/build.inc | 5 ++++-
spec/packages.inc | 40 ++++++++++++++--------------------------
spec/source.inc | 2 ++
3 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/spec/build.inc b/spec/build.inc
index 30c6402..3979073 100644
--- a/spec/build.inc
+++ b/spec/build.inc
@@ -4,6 +4,8 @@
%enableif %{enable_profiling} profiling
%global enable_lvmetad %(if echo %{services} | grep -q lvmetad; then echo 1; else echo 0; fi)
%enableif %{enable_lvmetad} lvmetad
+%global enable_lvmpolld %(if echo %{services} | grep -q lvmpolld; then echo 1; else echo 0; fi)
+%enableif %{enable_lvmpolld} lvmpolld
%build
%configure \
@@ -33,10 +35,11 @@ make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
make install_system_dirs DESTDIR=$RPM_BUILD_ROOT
-make install_initscripts DESTDIR=$RPM_BUILD_ROOT
%if %{enable_systemd}
make install_systemd_units DESTDIR=$RPM_BUILD_ROOT
make install_tmpfiles_configuration DESTDIR=$RPM_BUILD_ROOT
+%else
+make install_initscripts DESTDIR=$RPM_BUILD_ROOT
%endif
%if %{enable_testsuite}
make -C test install DESTDIR=$RPM_BUILD_ROOT
diff --git a/spec/packages.inc b/spec/packages.inc
index 109abd2..0aaae1d 100644
--- a/spec/packages.inc
+++ b/spec/packages.inc
@@ -83,6 +83,9 @@ fi
%if %{have_service lvmetad}
%{_sbindir}/lvmetad
%endif
+%if %{have_service lvmpolld}
+ %{_sbindir}/lvmpolld
+%endif
%if %{have_with cache}
%{_mandir}/man7/lvmcache.7.gz
%endif
@@ -149,6 +152,9 @@ fi
%{_udevdir}/69-dm-lvm-metad.rules
%endif
%endif
+%if %{have_service lvmetad}
+ %{_mandir}/man8/lvmpolld.8.gz
+%endif
%dir %{_sysconfdir}/lvm
%ghost %{_sysconfdir}/lvm/cache/.cache
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/lvm.conf
@@ -171,6 +177,10 @@ fi
%{_unitdir}/lvm2-pvscan@.service
%{_unitdir}/blk-availability.service
%endif
+ %if %{have_service lvmpolld}
+ %{_unitdir}/lvm2-lvmpolld.service
+ %{_unitdir}/lvm2-lvmpolld.socket
+ %endif
%else
%{_sysconfdir}/rc.d/init.d/lvm2-monitor
%{_sysconfdir}/rc.d/init.d/blk-availability
@@ -272,11 +282,12 @@ fi
%defattr(-,root,root,-)
%attr(755,root,root) /usr/sbin/clvmd
%{_mandir}/man8/clvmd.8.gz
-%{_sysconfdir}/rc.d/init.d/clvmd
%if %{enable_systemd}
%{_unitdir}/lvm2-clvmd.service
%{_unitdir}/lvm2-cluster-activation.service
%{_unitdir}/../lvm2-cluster-activation
+%else
+ %{_sysconfdir}/rc.d/init.d/clvmd
%endif
%endif
@@ -309,33 +320,10 @@ fi
%defattr(-,root,root,-)
%attr(755,root,root) /usr/sbin/cmirrord
%{_mandir}/man8/cmirrord.8.gz
-%{_sysconfdir}/rc.d/init.d/cmirrord
%if %{enable_systemd}
%{_unitdir}/lvm2-cmirrord.service
-%endif
-
-%endif
-
-##############################################################################
-# Legacy SysV init subpackage
-##############################################################################
-%if %{enable_systemd}
-
-%package sysvinit
-Summary: SysV style init script for LVM2.
-Group: System Environment/Base
-Requires: %{name} = %{version}-%{release}
-Requires: initscripts
-
-%description sysvinit
-SysV style init script for LVM2. It needs to be installed only if systemd
-is not used as the system init process.
-
-%files sysvinit
-%{_sysconfdir}/rc.d/init.d/lvm2-monitor
-%{_sysconfdir}/rc.d/init.d/blk-availability
-%if %{have_service lvmetad}
-%{_sysconfdir}/rc.d/init.d/lvm2-lvmetad
+%else
+ %{_sysconfdir}/rc.d/init.d/cmirrord
%endif
%endif
diff --git a/spec/source.inc b/spec/source.inc
index 36cb30f..a11f4b7 100644
--- a/spec/source.inc
+++ b/spec/source.inc
@@ -25,6 +25,8 @@
%service lvmetad 1
+%service lvmpolld 1
+
##############################################################
%if %{fedora} == 16 || %{rhel} == 6
9 years