summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarian Csontos <mcsontos@redhat.com>2015-07-03 09:46:49 +0200
committerMarian Csontos <mcsontos@redhat.com>2015-07-04 14:36:57 +0200
commit5fb71bd53062011dd962d77b233552ffad128238 (patch)
treeb0649d340528ccdf92bf57f4bc6f662896c0233c
parentdd385eb5ac963c74b617b912c99ef97e4a73486f (diff)
downloadlvm2-5fb71bd53062011dd962d77b233552ffad128238.tar.gz
lockd: Clean up spec
-rw-r--r--nix/default.nix2
-rw-r--r--spec/packages.inc4
2 files changed, 1 insertions, 5 deletions
diff --git a/nix/default.nix b/nix/default.nix
index c7462a09e..abfbcd9f4 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -367,7 +367,7 @@ let
centos66 = centos65;
centos70 = [ "dlm-devel" "dlm" "corosynclib-devel" "perl-Digest-MD5" "systemd-devel"
"socat" # used by test suite lvmpolld
- "sanlock" # used by test suite lvmlockd
+ # "sanlock" # used by lvmlockd. Required version present in 7.2 only
"procps-ng" ];
fedora17_18 = [ "dlm-devel" "corosynclib-devel" "libblkid" "libblkid-devel"
diff --git a/spec/packages.inc b/spec/packages.inc
index 8d2195a6a..ed02822a2 100644
--- a/spec/packages.inc
+++ b/spec/packages.inc
@@ -192,7 +192,6 @@ fi
%if %{have_service lvmlockd}
%{_unitdir}/lvm2-lvmlockd.service
%{_unitdir}/lvm2-lvmlocking.service
- #%{_unitdir}/lvm2-lvmlockd.socket
%endif
%else
%{_sysconfdir}/rc.d/init.d/lvm2-monitor
@@ -203,9 +202,6 @@ fi
%if %{have_service lvmpolld}
%{_sysconfdir}/rc.d/init.d/lvm2-lvmpolld
%endif
- #%if %{have_service lvmlockd}
- # %{_sysconfdir}/rc.d/init.d/lvm2-lvmlockd
- #%endif
%endif
##############################################################################