From 979e1012d290f71ff6dfe5dc155c496a0cd283e7 Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Mon, 20 Nov 2006 20:03:26 +0000 Subject: [PATCH] Install lvmdump by default. --- Makefile.in | 2 +- WHATS_NEW | 1 + configure | 3 ++- configure.in | 1 + man/Makefile.in | 4 ++-- scripts/Makefile.in | 23 +++++++++++++++++++++++ 6 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 scripts/Makefile.in diff --git a/Makefile.in b/Makefile.in index 6fb323409..782a1c829 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,7 +16,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -SUBDIRS = doc include man +SUBDIRS = doc include man scripts ifeq ("@INTL@", "yes") SUBDIRS += po diff --git a/WHATS_NEW b/WHATS_NEW index 0c79434f1..3bba8cf6f 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.15 - 20th November 2006 ==================================== + Install lvmdump by default. Fix check for snapshot module when activating snapshot. Fix pvremove error path for case when PV is in use. Warn if certain duplicate config file entries are seen. diff --git a/configure b/configure index 982090dcb..ad8b46c4f 100755 --- a/configure +++ b/configure @@ -11203,7 +11203,7 @@ fi ################################################################################ - ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile dmeventd/Makefile dmeventd/mirror/Makefile doc/Makefile include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/snapshot/Makefile man/Makefile po/Makefile tools/Makefile tools/version.h tools/fsadm/Makefile test/mm/Makefile test/device/Makefile test/format1/Makefile test/regex/Makefile test/filters/Makefile" + ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile dmeventd/Makefile dmeventd/mirror/Makefile doc/Makefile include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/snapshot/Makefile man/Makefile po/Makefile scripts/Makefile tools/Makefile tools/version.h tools/fsadm/Makefile test/mm/Makefile test/device/Makefile test/format1/Makefile test/regex/Makefile test/filters/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -11745,6 +11745,7 @@ do "lib/snapshot/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/snapshot/Makefile" ;; "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "po/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; + "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "tools/version.h" ) CONFIG_FILES="$CONFIG_FILES tools/version.h" ;; "tools/fsadm/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/fsadm/Makefile" ;; diff --git a/configure.in b/configure.in index 74aa2a9a0..c3b310b9c 100644 --- a/configure.in +++ b/configure.in @@ -637,6 +637,7 @@ lib/mirror/Makefile \ lib/snapshot/Makefile \ man/Makefile \ po/Makefile \ +scripts/Makefile \ tools/Makefile \ tools/version.h \ tools/fsadm/Makefile \ diff --git a/man/Makefile.in b/man/Makefile.in index 174dfee5a..4a61ee3de 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -18,8 +18,8 @@ VPATH = @srcdir@ MAN5=lvm.conf.5 MAN8=lvchange.8 lvconvert.8 lvcreate.8 lvdisplay.8 lvextend.8 lvm.8 \ - lvmchange.8 \ - lvmdiskscan.8 lvreduce.8 lvremove.8 lvrename.8 lvresize.8 lvs.8 \ + lvmchange.8 lvmdiskscan.8 lvmdump.8 \ + lvreduce.8 lvremove.8 lvrename.8 lvresize.8 lvs.8 \ lvscan.8 pvchange.8 pvcreate.8 pvdisplay.8 pvmove.8 pvremove.8 \ pvresize.8 pvs.8 pvscan.8 vgcfgbackup.8 vgcfgrestore.8 vgchange.8 \ vgck.8 vgcreate.8 vgconvert.8 vgdisplay.8 vgexport.8 vgextend.8 \ diff --git a/scripts/Makefile.in b/scripts/Makefile.in new file mode 100644 index 000000000..01def19de --- /dev/null +++ b/scripts/Makefile.in @@ -0,0 +1,23 @@ +# +# Copyright (C) 2006 Red Hat, Inc. All rights reserved. +# +# This file is part of the LVM2. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ + +include $(top_srcdir)/make.tmpl + +install: + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm_dump.sh \ + $(sbindir)/lvmdump +