commit dab0ac18f31351542b5f2d11943d2c70e1a74de7
Author: Jakub Bogusz <[email protected]>
Date: Fri Sep 7 22:21:07 2018 +0200
- updated to 2.02.181
- updated diet,device-mapper-dmsetup-export,pld_init,thin patches
- removed outdated selinux,fsadm-path,lvm_path,replicator patches
device-mapper-dmsetup-export.patch | 12 +--
fsadm-path.patch | 11 ---
lvm2-diet.patch | 37 ++++----
lvm2-lvm_path.patch | 12 ---
lvm2-pld_init.patch | 169 +++++++++++++++++++++----------------
lvm2-replicator.patch | 13 ---
lvm2-selinux.patch | 12 ---
lvm2-thin.patch | 18 ++--
lvm2.spec | 44 +++++-----
9 files changed, 150 insertions(+), 178 deletions(-)
---
diff --git a/lvm2.spec b/lvm2.spec
index ba59d8b..b3360c7 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,8 +1,7 @@
# TODO
# - vgscan --ignorelocking failure creates /var/lock/lvm (even if /var is not
yet mounted)
-# - spec default value for --with-replicators (=internal/shared/none,
configure default is none)?
-# (also internal vs shared for
lvm1,pool,cluster,snapshots,mirrors,raid,replicators,thin,cache;
-# note: dmeventd requires mirrors=internal)
+# - internal vs shared for cluster,snapshots,mirrors,thin,cache ?
+# note: dmeventd requires mirrors=internal)
#
# Conditional build:
# - initrd stuff
@@ -17,7 +16,6 @@
%bcond_without lvmpolld # lvmpolld (and lvmlockd)
%bcond_without lvmlockd # lvmlockd
%bcond_with sanlock # sanlock support in lvmlockd
-%bcond_with replicator # internal replicator support
# - additional features
%bcond_without selinux # SELinux support
# - bindings
@@ -58,31 +56,28 @@
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.173
-Release: 4
+Version: 2.02.181
+Release: 1
License: GPL v2 and LGPL v2.1
Group: Applications/System
Source0: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5: 61cba056ac552f2d362600d494b1b8d9
+# Source0-md5: 7d6380d9a34981fd7b605eaa371295b3
Source2: clvmd.service
Source3: clvmd.sysconfig
-Patch0: %{name}-selinux.patch
Patch1: %{name}-diet.patch
Patch2: device-mapper-dmsetup-export.patch
Patch3: %{name}-pld_init.patch
Patch4: dl-dlsym.patch
-Patch5: fsadm-path.patch
-Patch6: %{name}-lvm_path.patch
Patch7: %{name}-sd_notify.patch
Patch8: %{name}-clvmd_cmd_timeout.patch
Patch9: device-mapper-dmsetup-deps-export.patch
-Patch10: %{name}-replicator.patch
Patch11: %{name}-thin.patch
URL: http://www.sourceware.org/lvm2/
BuildRequires: autoconf >= 2.69
BuildRequires: automake
# for /run detection
BuildRequires: filesystem >= 3.0-43
+BuildRequires: libaio-devel
BuildRequires: libblkid-devel >= 2.24
%{?with_selinux:BuildRequires: libselinux-devel >= 1.10}
%{?with_selinux:BuildRequires: libsepol-devel}
@@ -394,22 +389,18 @@ potrzeby initrd.
%prep
%setup -q -n LVM2.%{version}
-%{?with_selinux:%patch0 -p1}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
%patch11 -p1
# do not force --export-symbol linker option for e.g. statically linked
executables
# -rdynamic compiler option drives linker in the right way.
-%{__sed} -i -e 's#-Wl,--export-dynamic#-rdynamic#g' configure.in
+%{__sed} -i -e 's#-Wl,--export-dynamic#-rdynamic#g' configure.ac
%build
%if %{with initrd}
@@ -440,11 +431,11 @@ cp -f /usr/share/automake/config.sub autoconf
%{__sed} -i -e 's#rpl_malloc#malloc#g' lib/misc/configure.h
%{__sed} -i -e 's#rpl_realloc#realloc#g' lib/misc/configure.h
-%{__make} -j1 -C include
-%{__make} -j1 -C lib LIB_SHARED= VERSIONED_SHLIB=
-%{__make} -j1 -C libdm LIB_SHARED= VERSIONED_SHLIB=
-%{__make} -j1 -C libdaemon/client LIB_SHARED= VERSIONED_SHLIB=
-%{__make} -j1 -C tools dmsetup.static lvm.static
%{?with_dietlibc:DIETLIBC_LIBS="-lcompat"}
+%{__make} -j1 -C include V=1
+%{__make} -j1 -C lib LIB_SHARED= VERSIONED_SHLIB= V=1
+%{__make} -j1 -C libdm LIB_SHARED= VERSIONED_SHLIB= V=1
+%{__make} -j1 -C libdaemon/client LIB_SHARED= VERSIONED_SHLIB= V=1
+%{__make} -j1 -C tools dmsetup.static lvm.static
%{?with_dietlibc:DIETLIBC_LIBS="-lcompat"} V=1
%{__mv} tools/lvm.static initrd-lvm
%{__mv} tools/dmsetup.static initrd-dmsetup
@@ -503,7 +494,6 @@ unset CC
--with-mirrors=internal \
--with-optimisation="%{rpmcflags}" \
--with-pool=internal \
- %{?with_replicator:--with-replicators=internal} \
--with-snapshots=internal \
--with-systemdsystemunitdir=%{systemdunitdir} \
--with-tmpfilesdir=%{systemdtmpfilesdir} \
@@ -517,9 +507,11 @@ unset CC
# use bash because of "set -o pipefail"
%{__make} -j1 \
- SHELL=/bin/bash
+ SHELL=/bin/bash \
+ V=1
%{__make} -j1 -C libdm \
- LIB_STATIC=libdevmapper.a
+ LIB_STATIC=libdevmapper.a \
+ V=1
%install
rm -rf $RPM_BUILD_ROOT
@@ -530,10 +522,12 @@ install -d
$RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/lvm,/etc/sysconfig}
DESTDIR=$RPM_BUILD_ROOT \
OWNER="" \
GROUP="" \
+ V=1 \
python3dir=%{py3_sitescriptdir}
%{__make} -C scripts install_tmpfiles_configuration \
DESTDIR=$RPM_BUILD_ROOT \
+ V=1
%if %{with cluster}
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/clvmd.service
@@ -869,11 +863,13 @@ fi
%attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2raid.so
%attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2snapshot.so
%attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2thin.so
+%attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2vdo.so
%dir %{_libdir}/device-mapper
%attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2mirror.so
%attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2raid.so
%attr(755,root,root)
%{_libdir}/device-mapper/libdevmapper-event-lvm2snapshot.so
%attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2thin.so
+%attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2vdo.so
%{_mandir}/man8/dmsetup.8*
%{_mandir}/man8/dmstats.8*
%{_mandir}/man8/dmeventd.8*
diff --git a/device-mapper-dmsetup-export.patch
b/device-mapper-dmsetup-export.patch
index d160fc4..0a378b5 100644
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -30,9 +30,9 @@
.CMD_HELP
.br
Outputs a summary of the commands available, optionally including
---- LVM2.2.02.170/tools/dmsetup.c.orig 2017-04-16 11:01:12.135929163 +0200
-+++ LVM2.2.02.170/tools/dmsetup.c 2017-04-16 11:13:43.259253920 +0200
-@@ -2248,6 +2248,93 @@
+--- LVM2.2.02.181/tools/dmsetup.c.orig 2018-09-07 20:22:51.648299609 +0200
++++ LVM2.2.02.181/tools/dmsetup.c 2018-09-07 20:26:20.021630562 +0200
+@@ -2570,6 +2570,93 @@
return r;
}
@@ -126,10 +126,10 @@
/* Show target names and their version numbers */
static int _targets(CMD_ARGS)
{
-@@ -5921,6 +6008,7 @@
+@@ -6245,6 +6332,7 @@
{"stats", "<command> [<options>] [<device>...]", 1, -1, 1, 1, _stats},
- {"status", "[<device>...] [--noflush] [--target <target_type>]", 0, -1,
1, 0, _status},
- {"table", "[<device>...] [--target <target_type>] [--showkeys]", 0, -1,
1, 0, _status},
+ {"status", "[<device>...] [--noflush] [--target <target_type>]", 0, -1,
2, 0, _status},
+ {"table", "[<device>...] [--concise] [--target <target_type>]
[--showkeys]", 0, -1, 2, 0, _status},
+ {"export", "[<device>]", 0, 1, 1, 0, _export},
{"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, 0, _wait},
{"mknodes", "[<device>...]", 0, -1, 1, 0, _mknodes},
diff --git a/fsadm-path.patch b/fsadm-path.patch
deleted file mode 100644
index f58f157..0000000
--- a/fsadm-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- LVM2.2.02.173/configure.in~ 2017-09-19 22:06:06.000000000 +0300
-+++ LVM2.2.02.173/configure.in 2017-09-19 22:09:52.779696341 +0300
-@@ -1899,7 +1899,7 @@
- AC_DEFINE_UNQUOTED(CLVMD_PATH, ["$CLVMD_PATH"], [Path to clvmd binary.])
-
-
--FSADM_PATH="$lvm_exec_prefix/sbin/fsadm"
-+FSADM_PATH="$sbindir/fsadm"
- AC_DEFINE_UNQUOTED(FSADM_PATH, ["$FSADM_PATH"], [Path to fsadm binary.])
-
-
################################################################################
diff --git a/lvm2-diet.patch b/lvm2-diet.patch
index cece1b8..0263961 100644
--- a/lvm2-diet.patch
+++ b/lvm2-diet.patch
@@ -126,42 +126,43 @@
/* FIXME Unused so far */
#undef HAVE_SYS_STATVFS_H
---- LVM2.2.02.149/tools/Makefile.in.orig 2016-04-05 22:05:48.151965546
+0200
-+++ LVM2.2.02.149/tools/Makefile.in 2016-04-05 22:16:22.108605605 +0200
-@@ -128,12 +128,12 @@
- CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS)
+--- LVM2.2.02.181/tools/Makefile.in.orig 2018-08-02 08:18:51.000000000
+0200
++++ LVM2.2.02.181/tools/Makefile.in 2018-09-07 20:22:21.481633286 +0200
+@@ -124,13 +124,13 @@
dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
-- $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS)
-L$(top_builddir)/libdm \
-+ $(CC) $(CFLAGS) -L$(interfacebuilddir) -L$(top_builddir)/libdm
$(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) \
+ @echo " [CC] $@"
+- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \
++ $(Q) $(CC) $(CFLAGS) -L$(interfacebuilddir) -L$(top_builddir)/libdm
$(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \
-o $@ dmsetup.o -ldevmapper $(LIBS)
dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
+ @echo " [CC] $@"
+- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
- -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS)
$(STATIC_LIBS) $(LIBS)
-+ $(CC) $(CFLAGS) -static -L$(interfacebuilddir) $(LDFLAGS) \
++ $(Q) $(CC) $(CFLAGS) -static -L$(interfacebuilddir) $(LDFLAGS) \
+ -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS)
$(STATIC_LIBS) $(LIBS) $(DIETLIBC_LIBS)
all: device-mapper
-@@ -141,7 +141,7 @@
- CFLAGS_lvmcmdline.o += $(VALGRIND_CFLAGS)
+@@ -140,7 +140,7 @@
lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
-- $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@
$(OBJECTS) lvm.o \
-+ $(CC) $(CFLAGS) -L$(interfacebuilddir) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS)
$(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
- $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
-
- ifeq ("@BUILD_LVMETAD@", "yes")
-@@ -150,7 +150,7 @@
+ @echo " [CC] $@"
+- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@
$(OBJECTS) lvm.o \
++ $(Q) $(CC) $(CFLAGS) -L$(interfacebuilddir) $(LDFLAGS)
$(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
+ $(LVMLIBS) $(READLINE_LIBS) $(LIBS)
+ DEFS_man-generator.o += -DMAN_PAGE_GENERATOR
+@@ -160,7 +160,7 @@
lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a
$(interfacebuilddir)/libdevmapper.a
- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
+ @echo " [CC] $@"
+ $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
+ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
$(PTHREAD_LIBS) $(DIETLIBC_LIBS)
liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o
lvm2cmd.o
- cat $(top_builddir)/lib/liblvm-internal.a > $@
+ @echo " [AR] $@"
--- LVM2.2.02.75/lib/metadata/pv.c.orig 2010-09-30 22:47:18.000000000
+0200
+++ LVM2.2.02.75/lib/metadata/pv.c 2010-11-06 12:05:40.672884033 +0100
@@ -17,6 +17,12 @@
diff --git a/lvm2-lvm_path.patch b/lvm2-lvm_path.patch
deleted file mode 100644
index 4edf715..0000000
--- a/lvm2-lvm_path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dur -x '*~' LVM2.2.02.95.orig/configure.in LVM2.2.02.95/configure.in
---- LVM2.2.02.95.orig/configure.in 2012-07-01 15:33:45.000000000 +0200
-+++ LVM2.2.02.95/configure.in 2012-07-02 18:41:07.560481138 +0200
-@@ -1267,7 +1267,7 @@
- lvm_exec_prefix=$exec_prefix
- test "$lvm_exec_prefix" = NONE && lvm_exec_prefix=$prefix
- test "$lvm_exec_prefix" = NONE && lvm_exec_prefix=$ac_default_prefix
--LVM_PATH="$lvm_exec_prefix/sbin/lvm"
-+LVM_PATH="$sbindir/lvm"
- AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.])
-
- if test "$CLVMD" != none; then
diff --git a/lvm2-pld_init.patch b/lvm2-pld_init.patch
index cbe146c..c1dd118 100644
--- a/lvm2-pld_init.patch
+++ b/lvm2-pld_init.patch
@@ -1,23 +1,31 @@
-diff -dur LVM2.2.02.98.orig/scripts/blk_availability_init_red_hat.in
LVM2.2.02.98/scripts/blk_availability_init_red_hat.in
---- LVM2.2.02.98.orig/scripts/blk_availability_init_red_hat.in 2012-10-15
16:24:58.000000000 +0200
-+++ LVM2.2.02.98/scripts/blk_availability_init_red_hat.in 2012-10-25
12:01:33.000000000 +0200
+--- LVM2.2.02.181/scripts/blk_availability_init_red_hat.in.orig
2018-08-02 08:18:51.000000000 +0200
++++ LVM2.2.02.181/scripts/blk_availability_init_red_hat.in 2018-09-07
20:43:11.884952342 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
- # Copyright (C) 2012 Red Hat, Inc. All rights reserved.
+ # Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved.
#
-@@ -43,16 +43,20 @@
+@@ -29,7 +29,7 @@
+ # Short-Description: Availability of block devices
+ ### END INIT INFO
+
+-. /etc/init.d/functions
++. /etc/rc.d/init.d/functions
+
+ script=blkdeactivate
+
+@@ -41,16 +41,20 @@
case "$1" in
start)
- touch $LOCK_FILE
+ touch "$LOCK_FILE"
+ exit 0
;;
stop)
-- action "Stopping block device availability:" $sbindir/$script $options
-+ run_cmd "Stopping block device availability:" $sbindir/$script $options
- rm -f $LOCK_FILE
+- action "Stopping block device availability:" "$sbindir/$script" $options
++ run_cmd "Stopping block device availability:" "$sbindir/$script"
$options
+ rm -f "$LOCK_FILE"
+ exit 0
;;
@@ -30,39 +38,44 @@ diff -dur
LVM2.2.02.98.orig/scripts/blk_availability_init_red_hat.in LVM2.2.02.9
+ exit 3
;;
esac
-diff -dur LVM2.2.02.98.orig/scripts/clvmd_init_red_hat.in
LVM2.2.02.98/scripts/clvmd_init_red_hat.in
---- LVM2.2.02.98.orig/scripts/clvmd_init_red_hat.in 2012-10-15
16:24:58.000000000 +0200
-+++ LVM2.2.02.98/scripts/clvmd_init_red_hat.in 2012-10-25 11:57:52.000000000
+0200
-@@ -65,9 +65,8 @@
+--- LVM2.2.02.181/scripts/clvmd_init_red_hat.in.orig 2018-09-07
20:29:42.941628244 +0200
++++ LVM2.2.02.181/scripts/clvmd_init_red_hat.in 2018-09-07
20:42:59.688285818 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # clvmd - Clustered LVM Daemon init script
+ #
+@@ -61,9 +61,8 @@
start()
{
if ! rh_status_q; then
- echo -n "Starting $DAEMON: "
+ msg_starting "$DAEMON"
- $DAEMON $CLVMDOPTS || return $?
+ "$usrsbindir/$DAEMON" $CLVMDOPTS || return $?
- echo
fi
# Refresh local cache.
-@@ -87,7 +86,7 @@
+@@ -83,7 +82,7 @@
- ${lvm_vgscan} > /dev/null 2>&1
+ "$lvm_vgscan" > /dev/null 2>&1
-- action "Activating VG(s):" ${lvm_vgchange} -aay $LVM_VGS || return $?
-+ run_cmd "Activating VG(s):" ${lvm_vgchange} -aay $LVM_VGS || return $?
+- action "Activating VG(s):" "$lvm_vgchange" -aay $LVM_VGS || return $?
++ run_cmd "Activating VG(s):" "$lvm_vgchange" -aay $LVM_VGS || return $?
- touch $LOCK_FILE
+ touch "$LOCK_FILE"
-@@ -112,27 +111,23 @@
+@@ -108,27 +107,23 @@
[ -z "$LVM_VGS" ] && LVM_VGS="$(clustered_vgs)"
if [ -n "$LVM_VGS" ]; then
-- action "Deactivating clustered VG(s):" ${lvm_vgchange} -anl
$LVM_VGS || return $?
-+ run_cmd "Deactivating clustered VG(s):" ${lvm_vgchange} -anl
$LVM_VGS || return $?
+- action "Deactivating clustered VG(s):" "$lvm_vgchange" -anl
$LVM_VGS || return $?
++ run_cmd "Deactivating clustered VG(s):" "$lvm_vgchange" -anl
$LVM_VGS || return $?
fi
-- action "Signaling $DAEMON to exit" kill -TERM $(pidofproc $DAEMON) ||
return $?
-+ run_cmd "Signaling $DAEMON to exit" kill -TERM $(pidofproc $DAEMON) ||
return $?
+- action "Signaling $DAEMON to exit" kill -TERM "$(pidofproc "$DAEMON")"
|| return $?
++ run_cmd "Signaling $DAEMON to exit" kill -TERM "$(pidofproc "$DAEMON")"
|| return $?
# wait half second before we start the waiting loop or we will show
# the loop more time than really necessary
@@ -85,46 +98,49 @@ diff -dur LVM2.2.02.98.orig/scripts/clvmd_init_red_hat.in
LVM2.2.02.98/scripts/c
+ ok
fi
- rm -f $LOCK_FILE
-@@ -142,7 +137,7 @@
+ rm -f "$LOCK_FILE"
+@@ -138,7 +133,7 @@
reload() {
rh_status_q || exit 7
-- action "Reloading $DAEMON configuration: " $DAEMON -R || return $?
-+ run_cmd "Reloading $DAEMON configuration: " $DAEMON -R || return $?
+- action "Reloading $DAEMON configuration: " "$usrsbindir/$DAEMON" -R ||
return $?
++ run_cmd "Reloading $DAEMON configuration: " "$usrsbindir/$DAEMON" -R ||
return $?
}
restart() {
-@@ -153,7 +148,7 @@
+@@ -149,7 +144,7 @@
# Try to get clvmd to restart itself. This will preserve
# exclusive LV locks
-- action "Restarting $DAEMON: " $DAEMON -S
-+ run_cmd "Restarting $DAEMON: " $DAEMON -S
+- action "Restarting $DAEMON: " "$usrsbindir/$DAEMON" -S
++ run_cmd "Restarting $DAEMON: " "$usrsbindir/$DAEMON" -S
# If that fails then do a normal stop & restart
if [ $? != 0 ]; then
---- LVM2.2.02.106/scripts/lvm2_monitoring_init_red_hat.in.orig 2014-04-10
17:38:46.000000000 +0200
-+++ LVM2.2.02.106/scripts/lvm2_monitoring_init_red_hat.in 2014-04-22
21:38:55.153260547 +0200
+@@ -206,7 +201,7 @@
+ ;;
+
+ *)
+- echo $"Usage: $0
{start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
++ msg_usage "$0
{start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ rtrn=2
+ ;;
+ esac
+--- LVM2.2.02.181/scripts/lvm2_monitoring_init_red_hat.in.orig 2018-08-02
08:18:51.000000000 +0200
++++ LVM2.2.02.181/scripts/lvm2_monitoring_init_red_hat.in 2018-09-07
21:12:38.944932161 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved.
#
-@@ -46,12 +46,19 @@
-
- start()
- {
-- ret=0
-+ local ret=0
- # TODO do we want to separate out already active groups only?
+@@ -60,7 +60,14 @@
VGSLIST=`$VGS --noheadings -o name --ignoreskippedcluster --config
'log{command_names=0 prefix=" "}' 2> /dev/null`
for vg in $VGSLIST
do
-- action "Starting monitoring for VG $vg:" $VGCHANGE --monitor y
--poll y --ignoreskippedcluster --config 'log{command_names=0 prefix=" "}' $vg
|| ret=$?
-+ msg_starting "Starting monitoring for VG $vg:"; busy
-+ $VGCHANGE --monitor y --poll y --ignoreskippedcluster --config
'log{command_names=0 prefix=" "}' $vg
+- action "Starting monitoring for VG $vg:" "$VGCHANGE" --monitor y
--poll y --ignoreskippedcluster --config 'log{command_names=0 prefix=" "}' $vg
|| ret=$?
++ msg_starting "monitoring for VG $vg:"; busy
++ "$VGCHANGE" --monitor y --poll y --ignoreskippedcluster --config
'log{command_names=0 prefix=" "}' $vg
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ fail
@@ -134,22 +150,13 @@ diff -dur LVM2.2.02.98.orig/scripts/clvmd_init_red_hat.in
LVM2.2.02.98/scripts/c
done
return $ret
-@@ -60,7 +67,7 @@
-
- stop()
- {
-- ret=0
-+ local ret=0
- # TODO do we want to separate out already active groups only?
- if test "$WARN" = "1"; then
- echo "Not stopping monitoring, this is a dangerous operation. Please
use force-stop to override."
-@@ -69,7 +76,14 @@
+@@ -78,7 +85,14 @@
VGSLIST=`$VGS --noheadings -o name --ignoreskippedcluster --config
'log{command_names=0 prefix=" "}' 2> /dev/null`
for vg in $VGSLIST
do
-- action "Stopping monitoring for VG $vg:" $VGCHANGE --monitor n
--ignoreskippedcluster --config 'log{command_names=0 prefix=" "}' $vg || ret=$?
-+ msg_stopping "Stopping monitoring for VG $vg:"; busy
-+ $VGCHANGE --monitor n --ignoreskippedcluster --config
'log{command_names=0 prefix=" "}' $vg
+- action "Stopping monitoring for VG $vg:" "$VGCHANGE" --monitor n
--ignoreskippedcluster --config 'log{command_names=0 prefix=" "}' $vg || ret=$?
++ msg_stopping "monitoring for VG $vg:"; busy
++ "$VGCHANGE" --monitor n --ignoreskippedcluster --config
'log{command_names=0 prefix=" "}' $vg
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ fail
@@ -159,49 +166,65 @@ diff -dur LVM2.2.02.98.orig/scripts/clvmd_init_red_hat.in
LVM2.2.02.98/scripts/c
done
return $ret
}
-diff -dur
LVM2.2.02.98.orig/scripts/blk_availability_systemd_red_hat.service.in
LVM2.2.02.98/scripts/blk_availability_systemd_red_hat.service.in
---- LVM2.2.02.98.orig/scripts/blk_availability_systemd_red_hat.service.in
2012-10-15 16:24:58.000000000 +0200
-+++ LVM2.2.02.98/scripts/blk_availability_systemd_red_hat.service.in
2012-10-29 15:38:31.000000000 +0100
+@@ -127,7 +141,7 @@
+ ;;
+
+ *)
+- echo $"Usage: $0 {start|stop|restart|status|force-stop}"
++ msg_usage "$0 {start|stop|restart|status|force-stop}"
+ ;;
+ esac
+
+--- LVM2.2.02.181/scripts/blk_availability_systemd_red_hat.service.in.orig
2018-09-07 20:29:42.941628244 +0200
++++ LVM2.2.02.181/scripts/blk_availability_systemd_red_hat.service.in
2018-09-07 21:28:09.498254872 +0200
@@ -6,7 +6,7 @@
[Service]
Type=oneshot
-ExecStart=/usr/bin/true
+ExecStart=/bin/true
- ExecStop=@sbindir@/blkdeactivate -u -l wholevg -m disablequeueing
+ ExecStop=@SBINDIR@/blkdeactivate -u -l wholevg -m disablequeueing -r wait
RemainAfterExit=yes
---- LVM2.2.02.149/scripts/lvm2_lvmetad_init_red_hat.in.orig 2016-04-01
21:32:17.000000000 +0200
-+++ LVM2.2.02.149/scripts/lvm2_lvmetad_init_red_hat.in 2016-04-08
15:34:29.481897884 +0200
+--- LVM2.2.02.181/scripts/lvm2_lvmetad_init_red_hat.in.orig 2018-08-02
08:18:51.000000000 +0200
++++ LVM2.2.02.181/scripts/lvm2_lvmetad_init_red_hat.in 2018-09-07
21:30:09.964920166 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
- # Copyright (C) 2012 Red Hat, Inc. All rights reserved.
+ # Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved.
#
-@@ -52,7 +52,7 @@
+@@ -31,7 +31,7 @@
+ # subsequent LVM commands or while using lvm2app library.
+ ### END INIT INFO
+
+-. /etc/init.d/functions
++. /etc/rc.d/init.d/functions
+
+ DAEMON=lvmetad
+
+@@ -51,14 +51,15 @@
start()
{
ret=0
-- action "Starting LVM metadata daemon:" $DAEMON || ret=$?
-+ run_cmd "Starting LVM metadata daemon:" $DAEMON || ret=$?
+- action "Starting LVM metadata daemon:" "$sbindir/$DAEMON" || ret=$?
++ run_cmd "Starting LVM metadata daemon:" "$sbindir/$DAEMON" || ret=$?
return $ret
}
-@@ -60,7 +60,8 @@
stop()
{
ret=0
-- action "Signaling LVM metadata daemon to exit:" killproc -p $PID_FILE
$DAEMON -TERM || ret=$?
+- action "Signaling LVM metadata daemon to exit:" killproc -p "$PID_FILE"
"$DAEMON" -TERM || ret=$?
+ msg_stopping "LVM metadata daemon"
-+ killproc -p $PID_FILE $DAEMON -TERM || ret=$?
++ killproc -p "$PID_FILE" "$DAEMON" -TERM || ret=$?
return $ret
}
-@@ -80,9 +81,10 @@
+@@ -78,9 +79,10 @@
stop
rtrn=$?
- [ $rtrn = 0 ] && rm -f $LOCK_FILE
+ [ "$rtrn" = 0 ] && rm -f "$LOCK_FILE"
+ exit 0
;;
@@ -210,12 +233,12 @@ diff -dur
LVM2.2.02.98.orig/scripts/blk_availability_systemd_red_hat.service.in
if stop
then
start
-@@ -105,7 +107,7 @@
+@@ -103,7 +105,7 @@
;;
*)
- echo $"Usage: $0
{start|stop|force-stop|restart|condrestart|try-restart|status}"
-+ echo "Usage: $0
{start|stop|force-stop|restart|force-reload|condrestart|try-restart|status}"
++ msg_usage "$0
{start|stop|force-stop|restart|force-reload|condrestart|try-restart|status}"
;;
esac
diff --git a/lvm2-replicator.patch b/lvm2-replicator.patch
deleted file mode 100644
index 8fd2db1..0000000
--- a/lvm2-replicator.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- LVM2.2.02.149/lib/replicator/replicator.c.orig 2016-04-01
21:32:16.000000000 +0200
-+++ LVM2.2.02.149/lib/replicator/replicator.c 2016-04-06 18:57:18.845480954
+0200
-@@ -752,8 +752,8 @@
- #ifdef REPLICATOR_INTERNAL
- int init_replicator_segtype(struct cmd_context *cmd, struct segtype_library
*seglib)
- #else /* Shared */
--int init_multiple_segtype(struct cmd_context *cmd, struct segtype_library
*seglib);
--int init_multiple_segtype(struct cmd_context *cmd, struct segtype_library
*seglib)
-+int init_multiple_segtypes(struct cmd_context *cmd, struct segtype_library
*seglib);
-+int init_multiple_segtypes(struct cmd_context *cmd, struct segtype_library
*seglib)
- #endif
- {
- struct segment_type *segtype;
diff --git a/lvm2-selinux.patch b/lvm2-selinux.patch
deleted file mode 100644
index fe6afbd..0000000
--- a/lvm2-selinux.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- LVM2.2.02.28/tools/Makefile.in~ 2007-08-20 23:55:30.000000000 +0300
-+++ LVM2.2.02.28/tools/Makefile.in 2007-10-31 19:45:05.169858091 +0200
-@@ -92,6 +92,9 @@
- endif
-
- LVMLIBS += -ldevmapper
-+ifneq ("@STATIC_LINK@", "yes")
-+ LVMLIBS += -lselinux -lsepol
-+endif
-
- DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
-
diff --git a/lvm2-thin.patch b/lvm2-thin.patch
index ce2e788..6864b77 100644
--- a/lvm2-thin.patch
+++ b/lvm2-thin.patch
@@ -1,6 +1,6 @@
---- LVM2.2.02.149/configure.in.orig 2016-04-06 16:05:03.799248008 +0200
-+++ LVM2.2.02.149/configure.in 2016-04-06 20:23:12.388598015 +0200
-@@ -463,7 +463,7 @@
+--- LVM2.2.02.181/configure.ac.orig 2018-09-07 21:39:53.148246839 +0200
++++ LVM2.2.02.181/configure.ac 2018-09-07 21:40:01.548246741 +0200
+@@ -397,7 +397,7 @@
AC_ARG_ENABLE(thin_check_needs_check,
AC_HELP_STRING([--disable-thin_check_needs_check],
[required if thin_check version is < 0.3.0]),
@@ -9,7 +9,7 @@
# Test if necessary thin tools are available
# if not - use plain defaults and warn user
-@@ -478,7 +478,7 @@
+@@ -412,7 +412,7 @@
THIN_CONFIGURE_WARN=y
fi
fi
@@ -18,7 +18,7 @@
THIN_CHECK_VSN=`"$THIN_CHECK_CMD" -V 2>/dev/null`
THIN_CHECK_VSN_MAJOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.'
'{print $1}'`
THIN_CHECK_VSN_MINOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.'
'{print $2}'`
-@@ -491,6 +491,8 @@
+@@ -425,6 +425,8 @@
AC_MSG_WARN([$THIN_CHECK_CMD: Old version
"$THIN_CHECK_VSN" found])
THIN_CHECK_VERSION_WARN=y
THIN_CHECK_NEEDS_CHECK=no
@@ -27,7 +27,7 @@
fi
fi
# Empty means a config way to ignore thin dumping
-@@ -577,7 +579,7 @@
+@@ -511,7 +513,7 @@
AC_ARG_ENABLE(cache_check_needs_check,
AC_HELP_STRING([--disable-cache_check_needs_check],
[required if cache_check version is < 0.5]),
@@ -36,7 +36,7 @@
# Test if necessary cache tools are available
# if not - use plain defaults and warn user
-@@ -592,7 +594,7 @@
+@@ -526,7 +528,7 @@
CACHE_CONFIGURE_WARN=y
fi
fi
@@ -45,9 +45,9 @@
$CACHE_CHECK_CMD -V 2>/dev/null >conftest.tmp
read -r CACHE_CHECK_VSN < conftest.tmp
IFS=.- read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR
CACHE_CHECK_VSN_PATCH LEFTOVER < conftest.tmp
-@@ -612,6 +614,8 @@
+@@ -550,6 +552,8 @@
+ AC_MSG_WARN([$CACHE_CHECK_CMD: Old version
"$CACHE_CHECK_VSN" does not support new cache format V2])
CACHE_CHECK_VERSION_WARN=y
- CACHE_CHECK_NEEDS_CHECK=no
fi
+ else
+ CACHE_CHECK_NEEDS_CHECK=yes
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lvm2.git/commitdiff/dab0ac18f31351542b5f2d11943d2c70e1a74de7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
