From 52edfba95b2f331531a94f49b5aae3c2deeb34da Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Thu, 20 May 2010 11:20:35 +0000
Subject: [PATCH] Install lvmconf script by default. Remove unnecessary
 versioned dmeventd plugin symlinks.

---
 WHATS_NEW           | 2 ++
 make.tmpl.in        | 1 -
 scripts/Makefile.in | 2 +-
 scripts/lvmconf.sh  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WHATS_NEW b/WHATS_NEW
index 5d098bcbc..cba89b7d3 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,7 @@
 Version 2.02.66 - 
 ===============================
+  Install lvmconf script by default.
+  Remove unnecessary versioned dmeventd plugin symlinks.
   Add tests for lvm_vgname_from_{pvid|device}.
   Add lvm2app interfaces to lookup a vgname from a pvid and pvname.
   Update pvchange to always obtain a vg handle for each pv to process.
diff --git a/make.tmpl.in b/make.tmpl.in
index 5bb319cae..fd7581228 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -310,7 +310,6 @@ install_lib_shared: $(LIB_SHARED)
 install_dm_plugin: $(LIB_SHARED)
 	$(INSTALL_PROGRAM) -D $< $(libdir)/device-mapper/$(<F)
 	$(LN_S) -f device-mapper/$(<F) $(libdir)/$(<F)
-	$(LN_S) -f $(<F) $(libdir)/$(<F).$(LIB_VERSION)
 
 install_lvm2_plugin: $(LIB_SHARED)
 	$(INSTALL_PROGRAM) -D $< $(libdir)/lvm2/$(<F)
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 92a63ce08..d5206c9e4 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -17,7 +17,7 @@ top_builddir = @top_builddir@
 
 include $(top_builddir)/make.tmpl
 
-SCRIPTS = lvmdump.sh vgimportclone.sh
+SCRIPTS = lvmdump.sh lvmconf.sh vgimportclone.sh
 ifeq ("@FSADM@", "yes")
 	SCRIPTS += fsadm.sh
 endif
diff --git a/scripts/lvmconf.sh b/scripts/lvmconf.sh
index 3caaf9138..5a8e9e84f 100644
--- a/scripts/lvmconf.sh
+++ b/scripts/lvmconf.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
 #
-# This file is part of the lvm2-cluster package.
+# This file is part of the lvm2 package.
 #
 # This copyrighted material is made available to anyone wishing to use,
 # modify, copy, or redistribute it subject to the terms and conditions
-- 
2.43.5