Accepting request 508098 from network:ha-clustering:Unstable
- Update to LVM2.2.02.172 - Cleanup spec file, and refresh patches - Fix zypper update issue with device-mapper package, see bsc#1045396 - Update to LVM2.2.02.172 - Cleanup spec file, and refresh patches - Fix zypper update issue with device-mapper package, see bsc#1045396 - Update to LVM2.2.02.172 - Cleanup spec file, and refresh patches - Fix zypper update issue with device-mapper package, see bsc#1045396 OBS-URL: https://build.opensuse.org/request/show/508098 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=194
This commit is contained in:
parent
ca0867bdb4
commit
39212502cd
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9372d2523027a751cf54eafdf8b761ff843969520c32b0c50abfba65e23d0d40
|
||||
size 2329694
|
@ -1,7 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.14 (GNU/Linux)
|
||||
|
||||
iEYEABECAAYFAljuyYIACgkQIoGRwVZ+LBf6MgCbBRfOPhmawTE3HPwPZNORFXyU
|
||||
UuMAoN38fO4+j+w4c8xYF9P5Wl3FYrGi
|
||||
=TbpB
|
||||
-----END PGP SIGNATURE-----
|
3
LVM2.2.02.172.tgz
Normal file
3
LVM2.2.02.172.tgz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eab09d4132e6ade4db22249e554919045948efb908ffa40409e8e8e0c316f708
|
||||
size 2351684
|
7
LVM2.2.02.172.tgz.asc
Normal file
7
LVM2.2.02.172.tgz.asc
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.14 (GNU/Linux)
|
||||
|
||||
iEYEABECAAYFAllT0e4ACgkQIoGRwVZ+LBfVwgCg+QlL7VAkmsIhPczlc+n/1LsT
|
||||
qccAnitUgn6j6QaE6F8faF5NR94JiDgF
|
||||
=hQbN
|
||||
-----END PGP SIGNATURE-----
|
@ -1,24 +0,0 @@
|
||||
From c245996d700458f6ab159a387483736f1c1a6fbf Mon Sep 17 00:00:00 2001
|
||||
From: Zdenek Kabelac <zkabelac@redhat.com>
|
||||
Date: Tue, 30 May 2017 12:59:21 +0200
|
||||
Subject: [PATCH] tests: missed to export lvm binary for fsadm
|
||||
|
||||
---
|
||||
test/shell/lvresize-full.sh | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/test/shell/lvresize-full.sh b/test/shell/lvresize-full.sh
|
||||
index 17ee6aa..3eef11a 100644
|
||||
--- a/test/shell/lvresize-full.sh
|
||||
+++ b/test/shell/lvresize-full.sh
|
||||
@@ -20,6 +20,7 @@ SKIP_WITH_LVMPOLLD=1
|
||||
FSCK=${FSCK-fsck}
|
||||
MKFS=${MKFS-mkfs.ext3}
|
||||
RESIZEFS=${RESIZEFS-resize2fs}
|
||||
+export LVM_BINARY=$(which lvm)
|
||||
|
||||
which $FSCK || skip
|
||||
which $MKFS || skip
|
||||
--
|
||||
2.10.2
|
||||
|
@ -1,21 +1,21 @@
|
||||
From f977d86dfea51a09eed1787071676e1d45a8f2f4 Mon Sep 17 00:00:00 2001
|
||||
From c0d05011007bb46232e64435e05f6f6da212655b Mon Sep 17 00:00:00 2001
|
||||
From: Eric Ren <zren@suse.com>
|
||||
Date: Tue, 16 May 2017 15:26:54 +0800
|
||||
Date: Tue, 4 Jul 2017 20:11:17 +0800
|
||||
Subject: [PATCH] build: skip compliling daemons/lvmlockd directory
|
||||
|
||||
bsc#1037309
|
||||
|
||||
Signed-off-by: Eric Ren <zren@suse.com>
|
||||
Signed-off-by: Eric Ren <zren@suse.com>
|
||||
---
|
||||
configure | 3 ++-
|
||||
daemons/Makefile.in | 6 +++---
|
||||
2 files changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 4b8311848..cb4d790de 100755
|
||||
index e1ae0e8..c442459 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -11772,7 +11772,8 @@ test -n "$LVMPOLLD" && BUILD_LVMPOLLD=$LVMPOLLD
|
||||
@@ -11865,7 +11865,8 @@ test -n "$LVMPOLLD" && BUILD_LVMPOLLD=$LVMPOLLD
|
||||
$as_echo "$BUILD_LVMPOLLD" >&6; }
|
||||
|
||||
################################################################################
|
||||
@ -23,10 +23,10 @@ index 4b8311848..cb4d790de 100755
|
||||
+# BUILD_LVMLOCKD=no
|
||||
+BUILD_LVMLOCKD=yes
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build lockdsanlock" >&5
|
||||
$as_echo_n "checking whether to build lockdsanlock... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build lvmlockdsanlock" >&5
|
||||
$as_echo_n "checking whether to build lvmlockdsanlock... " >&6; }
|
||||
diff --git a/daemons/Makefile.in b/daemons/Makefile.in
|
||||
index ebbd740ef..58d5fef94 100644
|
||||
index ebbd740..58d5fef 100644
|
||||
--- a/daemons/Makefile.in
|
||||
+++ b/daemons/Makefile.in
|
||||
@@ -40,9 +40,9 @@ ifeq ("@BUILD_LVMPOLLD@", "yes")
|
||||
@ -43,5 +43,5 @@ index ebbd740ef..58d5fef94 100644
|
||||
ifeq ("@BUILD_LVMDBUSD@", "yes")
|
||||
SUBDIRS += lvmdbusd
|
||||
--
|
||||
2.12.0
|
||||
2.10.2
|
||||
|
@ -1,28 +0,0 @@
|
||||
From 90d6f1d65de4c314af1aab1e0deddcb0d64bbd06 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Brown <neilb@suse.de>
|
||||
Date: Fri, 19 Aug 2016 16:13:09 +0200
|
||||
Subject: [PATCH] Always create /dev/device-mapper link
|
||||
|
||||
Make sure
|
||||
/dev/device-mapper
|
||||
exists as a link to /dev/mapper/control
|
||||
|
||||
Resolves: bnc#724578
|
||||
Signed-off-by: NeilBrown <neilb@suse.de>
|
||||
---
|
||||
udev/10-dm.rules.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: LVM2.2.02.165/udev/10-dm.rules.in
|
||||
===================================================================
|
||||
--- LVM2.2.02.165.orig/udev/10-dm.rules.in
|
||||
+++ LVM2.2.02.165/udev/10-dm.rules.in
|
||||
@@ -28,7 +28,7 @@
|
||||
# Also, keep in mind that recent rules may also require recent
|
||||
# subsystem-specific binaries.
|
||||
|
||||
-KERNEL=="device-mapper", NAME="(DM_DIR)/control"
|
||||
+KERNEL=="device-mapper", NAME="(DM_DIR)/control", SYMLINK+="device-mapper"
|
||||
|
||||
SUBSYSTEM!="block", GOTO="dm_end"
|
||||
KERNEL!="dm-[0-9]*", GOTO="dm_end"
|
@ -1,25 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 4 10:24:40 UTC 2017 - zren@suse.com
|
||||
|
||||
- Update to LVM2.2.02.172
|
||||
- Cleanup spec file, and refresh patches
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 29 16:38:05 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
- Add Special migration for libdevmapper's move from /lib to
|
||||
/usr/lib and from device-mapper.rpm to libdevmapper.rpm: the
|
||||
library is now in %{_libdir}, but up to the point where zypp
|
||||
removes the 'old' device-mapper package, the old library 'wins'
|
||||
the ldloader race resulting in binaries asking for the newer
|
||||
version still getting the old one (boo#1045396).
|
||||
|
||||
A typical update issue seen is, zypp updating packages in this
|
||||
order:
|
||||
- libdevmapper1_03 (new package)
|
||||
- libcryptsetup4 (links libdevmapper-1.03, rpm dep satisfied)
|
||||
- systemd (linking libcryptsetup.so.4, rpm dep satisfied
|
||||
At this point, anything calling systemdctl gets libdevmapper
|
||||
from the old device-mapper package into the memory, which in
|
||||
turn is version 1.02 and does not provide all the needed
|
||||
symbols
|
||||
- device-mapper (which removes /lib/libdevmapper.so.1.02, but is
|
||||
now too late, as various post scripts already failed on running
|
||||
systemctl)
|
||||
- Fix zypper update issue with device-mapper package, see bsc#1045396
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jun 17 16:50:53 UTC 2017 - zren@suse.com
|
||||
|
@ -19,9 +19,9 @@
|
||||
%define libname libdevmapper1_03
|
||||
%define libname_event libdevmapper-event1_03
|
||||
### COMMON-DEF-BEGIN ###
|
||||
%define lvm2_version 2.02.170
|
||||
%define device_mapper_version 1.02.139
|
||||
%define thin_provisioning_version 0.5.6
|
||||
%define lvm2_version 2.02.172
|
||||
%define device_mapper_version 1.02.141
|
||||
%define thin_provisioning_version 0.7.0
|
||||
### COMMON-DEF-END ###
|
||||
Name: device-mapper
|
||||
Version: %{device_mapper_version}
|
||||
@ -47,7 +47,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%{?systemd_requires}
|
||||
### COMMON-PATCH-BEGIN ###
|
||||
# Upstream patches
|
||||
Patch0001: bug-1033691_tests-missed-to-export-lvm-binary-for-fsadm.patch
|
||||
|
||||
# SUSE patches: 1000+ for LVM
|
||||
# Never upstream
|
||||
@ -83,31 +82,23 @@ Patch1016: lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
|
||||
|
||||
#SUSE patches 2000+ for device mapper, udev rules
|
||||
#bsc#479104,bnc#707253
|
||||
Patch2000: device-mapper-dmsetup-export.patch
|
||||
# no reference
|
||||
Patch2001: device-mapper-gcc-warnings.patch
|
||||
#bsc#724578
|
||||
Patch2002: device-mapper-link.patch
|
||||
Patch2001: device-mapper-dmsetup-export.patch
|
||||
#bnc#78902,bnc#789019,bnc#789020
|
||||
Patch2003: udev_rules-update.diff
|
||||
Patch2002: udev_rules-update.diff
|
||||
#bnc#875233
|
||||
Patch2004: udev-Check-for-DM_NR_VALID_PATHS.patch
|
||||
Patch2003: udev-Check-for-DM_NR_VALID_PATHS.patch
|
||||
#bnc909358
|
||||
Patch2005: Import-ID_FS_XXX-variables-bnc909358.patch
|
||||
Patch2004: Import-ID_FS_XXX-variables-bnc909358.patch
|
||||
#bsc#932300
|
||||
Patch2006: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
|
||||
Patch2005: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
|
||||
#bsc#940298
|
||||
Patch2007: libdm-iface-not-output-error-message-inside-retry-loop.patch
|
||||
Patch2006: libdm-iface-not-output-error-message-inside-retry-loop.patch
|
||||
#bnc#990538,bnc#986734
|
||||
Patch2008: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
|
||||
Patch2007: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
|
||||
#bsc#1012973
|
||||
Patch2009: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
|
||||
|
||||
# 3000+ for test code
|
||||
#bnc#950089
|
||||
Patch3001: lvm2-testsuite.patch
|
||||
#bsc#1043040
|
||||
Patch3002: bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
|
||||
Patch2008: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
|
||||
# no reference
|
||||
Patch2009: device-mapper-gcc-warnings.patch
|
||||
### COMMON-PATCH-END ###
|
||||
|
||||
%description
|
||||
@ -116,7 +107,6 @@ Programs and man pages for configuring and using the device mapper.
|
||||
%prep
|
||||
%setup -q -n LVM2.%{lvm2_version}
|
||||
### COMMON-PREP-BEGIN ###
|
||||
%patch0001 -p1
|
||||
%patch1001 -p1
|
||||
%patch1002 -p1
|
||||
%patch1003 -p1
|
||||
@ -133,7 +123,6 @@ Programs and man pages for configuring and using the device mapper.
|
||||
%patch1014 -p1
|
||||
%patch1015 -p1
|
||||
%patch1016 -p1
|
||||
%patch2000 -p1
|
||||
%patch2001 -p1
|
||||
%patch2002 -p1
|
||||
%patch2003 -p1
|
||||
@ -143,8 +132,6 @@ Programs and man pages for configuring and using the device mapper.
|
||||
%patch2007 -p1
|
||||
%patch2008 -p1
|
||||
%patch2009 -p1
|
||||
%patch3001 -p1
|
||||
%patch3002 -p1
|
||||
### COMMON-PREP-END ###
|
||||
|
||||
%build
|
||||
@ -260,6 +247,7 @@ if [ -f /%{_lib}/libdevmapper.so.1.03 ]; then
|
||||
rm /%{_lib}/libdevmapper.so.1.03
|
||||
fi
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun -n %{libname} -p /sbin/ldconfig
|
||||
|
||||
%package -n %{libname_event}
|
||||
|
@ -1,6 +1,6 @@
|
||||
From 67a7538475e9e292103a80fed8cff8ab380314a2 Mon Sep 17 00:00:00 2001
|
||||
From: Lidong Zhong <lzhong@suse.com>
|
||||
Date: Fri, 6 Mar 2015 18:35:04 +0800
|
||||
From 02cb88827f05e4a18664d85b6d40bf33c22a3453 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Ren <zren@suse.com>
|
||||
Date: Tue, 4 Jul 2017 20:00:34 +0800
|
||||
Subject: [Patch v2] fsadm: add support for btrfs
|
||||
|
||||
Check: mount the device first and then run`btrfs filesystem scrub start
|
||||
@ -12,19 +12,23 @@ filesystem
|
||||
---
|
||||
Hi David,
|
||||
|
||||
This is the patch I sent to upstream. It works fine based on our test.
|
||||
Please shed your light and thank you for taking time to review.
|
||||
This is the patch I sent to upstream. It works fine based on our
|
||||
test.
|
||||
Please shed your light and thank you for taking time to review.
|
||||
|
||||
Regards,
|
||||
Lidong
|
||||
Regards,
|
||||
Lidong
|
||||
|
||||
scripts/fsadm.sh | 104 ++++++++++++++++++++++++++++++++++++++++++++++---------
|
||||
1 file changed, 88 insertions(+), 16 deletions(-)
|
||||
Signed-off-by: Lidong Zhong <lzhong@suse.com>
|
||||
Refreshed-by: Eric Ren <zren@suse.com>
|
||||
---
|
||||
scripts/fsadm.sh | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
|
||||
1 file changed, 81 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: LVM2.2.02.152/scripts/fsadm.sh
|
||||
===================================================================
|
||||
--- LVM2.2.02.152.orig/scripts/fsadm.sh
|
||||
+++ LVM2.2.02.152/scripts/fsadm.sh
|
||||
diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh
|
||||
index adf9b55..28a7854 100755
|
||||
--- a/scripts/fsadm.sh
|
||||
+++ b/scripts/fsadm.sh
|
||||
@@ -22,6 +22,7 @@
|
||||
# ext2/ext3/ext4: resize2fs, tune2fs
|
||||
# reiserfs: resize_reiserfs, reiserfstune
|
||||
@ -41,17 +45,20 @@ Index: LVM2.2.02.152/scripts/fsadm.sh
|
||||
|
||||
# user may override lvm location by setting LVM_BINARY
|
||||
LVM=${LVM_BINARY:-lvm}
|
||||
@@ -75,6 +77,9 @@ BLOCKCOUNT=
|
||||
@@ -75,6 +77,12 @@ BLOCKCOUNT=
|
||||
MOUNTPOINT=
|
||||
MOUNTED=
|
||||
REMOUNT=
|
||||
+FINDMNT=
|
||||
+UUID=
|
||||
+BTRFS_DEVID=
|
||||
PROCMOUNTS="/proc/mounts"
|
||||
PROCSELFMOUNTINFO="/proc/self/mountinfo"
|
||||
NULL="$DM_DEV_DIR/null"
|
||||
@@ -148,7 +153,7 @@ cleanup() {
|
||||
+PROCMOUNTS="/proc/mounts"
|
||||
+PROCSELFMOUNTINFO="/proc/self/mountinfo"
|
||||
+NULL="$DM_DEV_DIR/null"
|
||||
PROCDIR="/proc"
|
||||
PROCMOUNTS="$PROCDIR/mounts"
|
||||
PROCSELFMOUNTINFO="$PROCDIR/self/mountinfo"
|
||||
@@ -152,7 +160,7 @@ cleanup() {
|
||||
export _FSADM_YES _FSADM_EXTOFF
|
||||
unset FSADM_RUNNING
|
||||
test -n "$LVM_BINARY" && PATH=$_SAVEPATH
|
||||
@ -60,8 +67,8 @@ Index: LVM2.2.02.152/scripts/fsadm.sh
|
||||
fi
|
||||
|
||||
# error exit status for break
|
||||
@@ -207,6 +212,34 @@ detect_fs() {
|
||||
verbose "\"$FSTYPE\" filesystem found on \"$VOLUME\""
|
||||
@@ -225,6 +233,36 @@ detect_fs() {
|
||||
verbose "\"$FSTYPE\" filesystem found on \"$VOLUME\"."
|
||||
}
|
||||
|
||||
+check_findmnt() {
|
||||
@ -92,14 +99,18 @@ Index: LVM2.2.02.152/scripts/fsadm.sh
|
||||
+ IFS=$STR_IFS
|
||||
+}
|
||||
+
|
||||
detect_mounted_with_proc_self_mountinfo() {
|
||||
MOUNTED=$("$GREP" "^[0-9]* [0-9]* $MAJORMINOR " "$PROCSELFMOUNTINFO")
|
||||
+detect_mounted_with_proc_self_mountinfo() {
|
||||
+ MOUNTED=$("$GREP" "^[0-9]* [0-9]* $MAJORMINOR " "$PROCSELFMOUNTINFO")
|
||||
|
||||
# Check that passed mounted MAJOR:MINOR is not matching $MAJOR:MINOR of resized $VOLUME
|
||||
validate_mounted_major_minor() {
|
||||
@@ -348,8 +386,12 @@ detect_mounted_with_proc_mounts() {
|
||||
|
||||
@@ -243,7 +276,11 @@ detect_mounted_with_proc_mounts() {
|
||||
# check if the given device is already mounted and where
|
||||
# FIXME: resolve swap usage and device stacking
|
||||
detect_mounted() {
|
||||
-detect_mounted() {
|
||||
- if test -e "$PROCSELFMOUNTINFO"; then
|
||||
+detect_mounted() {
|
||||
+ if test "$FSTYPE" = "btrfs" ; then
|
||||
+ check_findmnt || error "Need 'findmnt' utility to work with btrfs filesystem"
|
||||
+ detect_fs_uuid || verbose "Can't get fs UUID from \"$VOLUME\" volume"
|
||||
@ -108,7 +119,7 @@ Index: LVM2.2.02.152/scripts/fsadm.sh
|
||||
detect_mounted_with_proc_self_mountinfo
|
||||
elif test -e "$PROCMOUNTS"; then
|
||||
detect_mounted_with_proc_mounts
|
||||
@@ -396,6 +433,31 @@ resize_xfs() {
|
||||
@@ -514,6 +556,31 @@ resize_xfs() {
|
||||
fi
|
||||
}
|
||||
|
||||
@ -140,15 +151,18 @@ Index: LVM2.2.02.152/scripts/fsadm.sh
|
||||
####################
|
||||
# Resize filesystem
|
||||
####################
|
||||
@@ -412,6 +474,7 @@ resize() {
|
||||
@@ -530,6 +597,10 @@ resize() {
|
||||
"ext3"|"ext2"|"ext4") resize_ext $NEWSIZE ;;
|
||||
"reiserfs") resize_reiser $NEWSIZE ;;
|
||||
"xfs") resize_xfs $NEWSIZE ;;
|
||||
+ "btrfs") resize_btrfs $NEWSIZE ;;
|
||||
*) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool" ;;
|
||||
esac || error "Resize $FSTYPE failed"
|
||||
+ *) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool" ;;
|
||||
+ esac || error "Resize $FSTYPE failed"
|
||||
+ cleanup 0
|
||||
*) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;;
|
||||
esac || error "Resize $FSTYPE failed."
|
||||
cleanup 0
|
||||
@@ -469,6 +532,12 @@ check() {
|
||||
@@ -587,6 +658,12 @@ check() {
|
||||
# Think about better way....
|
||||
dry "$XFS_REPAIR" -n -o force_geometry "$VOLUME"
|
||||
fi ;;
|
||||
@ -161,7 +175,7 @@ Index: LVM2.2.02.152/scripts/fsadm.sh
|
||||
*) # check if executed from interactive shell environment
|
||||
case "$-" in
|
||||
*i*) dry "$FSCK" $YES $FORCE "$VOLUME" ;;
|
||||
@@ -490,7 +559,7 @@ test -n "$FSADM_RUNNING" && exit 0
|
||||
@@ -608,7 +685,7 @@ test -n "$FSADM_RUNNING" && exit 0
|
||||
for i in "$TUNE_EXT" "$RESIZE_EXT" "$TUNE_REISER" "$RESIZE_REISER" \
|
||||
"$TUNE_XFS" "$RESIZE_XFS" "$MOUNT" "$UMOUNT" "$MKDIR" \
|
||||
"$RMDIR" "$BLOCKDEV" "$BLKID" "$GREP" "$READLINK" \
|
||||
@ -170,3 +184,6 @@ Index: LVM2.2.02.152/scripts/fsadm.sh
|
||||
test -n "$i" || error "Required command definitions in the script are missing!"
|
||||
done
|
||||
|
||||
--
|
||||
2.10.2
|
||||
|
||||
|
@ -1,25 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 4 10:24:40 UTC 2017 - zren@suse.com
|
||||
|
||||
- Update to LVM2.2.02.172
|
||||
- Cleanup spec file, and refresh patches
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 29 16:38:05 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
- Add Special migration for libdevmapper's move from /lib to
|
||||
/usr/lib and from device-mapper.rpm to libdevmapper.rpm: the
|
||||
library is now in %{_libdir}, but up to the point where zypp
|
||||
removes the 'old' device-mapper package, the old library 'wins'
|
||||
the ldloader race resulting in binaries asking for the newer
|
||||
version still getting the old one (boo#1045396).
|
||||
|
||||
A typical update issue seen is, zypp updating packages in this
|
||||
order:
|
||||
- libdevmapper1_03 (new package)
|
||||
- libcryptsetup4 (links libdevmapper-1.03, rpm dep satisfied)
|
||||
- systemd (linking libcryptsetup.so.4, rpm dep satisfied
|
||||
At this point, anything calling systemdctl gets libdevmapper
|
||||
from the old device-mapper package into the memory, which in
|
||||
turn is version 1.02 and does not provide all the needed
|
||||
symbols
|
||||
- device-mapper (which removes /lib/libdevmapper.so.1.02, but is
|
||||
now too late, as various post scripts already failed on running
|
||||
systemctl)
|
||||
- Fix zypper update issue with device-mapper package, see bsc#1045396
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jun 17 16:50:53 UTC 2017 - zren@suse.com
|
||||
|
@ -19,9 +19,9 @@
|
||||
%define dlm_version 3.99.1
|
||||
%define sanlock_version 3.3.0
|
||||
### COMMON-DEF-BEGIN ###
|
||||
%define lvm2_version 2.02.170
|
||||
%define device_mapper_version 1.02.139
|
||||
%define thin_provisioning_version 0.5.6
|
||||
%define lvm2_version 2.02.172
|
||||
%define device_mapper_version 1.02.141
|
||||
%define thin_provisioning_version 0.7.0
|
||||
### COMMON-DEF-END ###
|
||||
Name: lvm2-clvm
|
||||
Version: %{lvm2_version}
|
||||
@ -50,7 +50,6 @@ Obsoletes: cmirrord < %{version}
|
||||
Provides: cmirrord = %{version}
|
||||
### COMMON-PATCH-BEGIN ###
|
||||
# Upstream patches
|
||||
Patch0001: bug-1033691_tests-missed-to-export-lvm-binary-for-fsadm.patch
|
||||
|
||||
# SUSE patches: 1000+ for LVM
|
||||
# Never upstream
|
||||
@ -86,31 +85,23 @@ Patch1016: lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
|
||||
|
||||
#SUSE patches 2000+ for device mapper, udev rules
|
||||
#bsc#479104,bnc#707253
|
||||
Patch2000: device-mapper-dmsetup-export.patch
|
||||
# no reference
|
||||
Patch2001: device-mapper-gcc-warnings.patch
|
||||
#bsc#724578
|
||||
Patch2002: device-mapper-link.patch
|
||||
Patch2001: device-mapper-dmsetup-export.patch
|
||||
#bnc#78902,bnc#789019,bnc#789020
|
||||
Patch2003: udev_rules-update.diff
|
||||
Patch2002: udev_rules-update.diff
|
||||
#bnc#875233
|
||||
Patch2004: udev-Check-for-DM_NR_VALID_PATHS.patch
|
||||
Patch2003: udev-Check-for-DM_NR_VALID_PATHS.patch
|
||||
#bnc909358
|
||||
Patch2005: Import-ID_FS_XXX-variables-bnc909358.patch
|
||||
Patch2004: Import-ID_FS_XXX-variables-bnc909358.patch
|
||||
#bsc#932300
|
||||
Patch2006: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
|
||||
Patch2005: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
|
||||
#bsc#940298
|
||||
Patch2007: libdm-iface-not-output-error-message-inside-retry-loop.patch
|
||||
Patch2006: libdm-iface-not-output-error-message-inside-retry-loop.patch
|
||||
#bnc#990538,bnc#986734
|
||||
Patch2008: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
|
||||
Patch2007: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
|
||||
#bsc#1012973
|
||||
Patch2009: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
|
||||
|
||||
# 3000+ for test code
|
||||
#bnc#950089
|
||||
Patch3001: lvm2-testsuite.patch
|
||||
#bsc#1043040
|
||||
Patch3002: bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
|
||||
Patch2008: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
|
||||
# no reference
|
||||
Patch2009: device-mapper-gcc-warnings.patch
|
||||
### COMMON-PATCH-END ###
|
||||
|
||||
%description
|
||||
@ -120,7 +111,6 @@ A daemon for using LVM2 Logival Volumes in a clustered environment.
|
||||
%setup -q -n LVM2.%{lvm2_version}
|
||||
|
||||
### COMMON-PREP-BEGIN ###
|
||||
%patch0001 -p1
|
||||
%patch1001 -p1
|
||||
%patch1002 -p1
|
||||
%patch1003 -p1
|
||||
@ -137,7 +127,6 @@ A daemon for using LVM2 Logival Volumes in a clustered environment.
|
||||
%patch1014 -p1
|
||||
%patch1015 -p1
|
||||
%patch1016 -p1
|
||||
%patch2000 -p1
|
||||
%patch2001 -p1
|
||||
%patch2002 -p1
|
||||
%patch2003 -p1
|
||||
@ -147,8 +136,6 @@ A daemon for using LVM2 Logival Volumes in a clustered environment.
|
||||
%patch2007 -p1
|
||||
%patch2008 -p1
|
||||
%patch2009 -p1
|
||||
%patch3001 -p1
|
||||
%patch3002 -p1
|
||||
### COMMON-PREP-END ###
|
||||
|
||||
%build
|
||||
@ -165,8 +152,8 @@ extra_opts="
|
||||
--with-clvmd=corosync
|
||||
--with-cluster=internal
|
||||
--enable-cmirrord
|
||||
--enable-lockd-dlm
|
||||
--enable-lockd-sanlock
|
||||
--enable-lvmlockd-dlm
|
||||
--enable-lvmlockd-sanlock
|
||||
"
|
||||
|
||||
### COMMON-CONFIG-BEGIN ###
|
||||
|
26
lvm2.changes
26
lvm2.changes
@ -1,25 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 4 10:24:40 UTC 2017 - zren@suse.com
|
||||
|
||||
- Update to LVM2.2.02.172
|
||||
- Cleanup spec file, and refresh patches
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 29 16:38:05 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
- Add Special migration for libdevmapper's move from /lib to
|
||||
/usr/lib and from device-mapper.rpm to libdevmapper.rpm: the
|
||||
library is now in %{_libdir}, but up to the point where zypp
|
||||
removes the 'old' device-mapper package, the old library 'wins'
|
||||
the ldloader race resulting in binaries asking for the newer
|
||||
version still getting the old one (boo#1045396).
|
||||
|
||||
A typical update issue seen is, zypp updating packages in this
|
||||
order:
|
||||
- libdevmapper1_03 (new package)
|
||||
- libcryptsetup4 (links libdevmapper-1.03, rpm dep satisfied)
|
||||
- systemd (linking libcryptsetup.so.4, rpm dep satisfied
|
||||
At this point, anything calling systemdctl gets libdevmapper
|
||||
from the old device-mapper package into the memory, which in
|
||||
turn is version 1.02 and does not provide all the needed
|
||||
symbols
|
||||
- device-mapper (which removes /lib/libdevmapper.so.1.02, but is
|
||||
now too late, as various post scripts already failed on running
|
||||
systemctl)
|
||||
- Fix zypper update issue with device-mapper package, see bsc#1045396
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jun 17 16:50:53 UTC 2017 - zren@suse.com
|
||||
|
56
lvm2.spec
56
lvm2.spec
@ -19,11 +19,13 @@
|
||||
%define _udevdir %(pkg-config --variable=udevdir udev)
|
||||
%define applib liblvm2app2_2
|
||||
%define cmdlib liblvm2cmd2_02
|
||||
|
||||
### COMMON-DEF-BEGIN ###
|
||||
%define lvm2_version 2.02.170
|
||||
%define device_mapper_version 1.02.139
|
||||
%define thin_provisioning_version 0.5.6
|
||||
%define lvm2_version 2.02.172
|
||||
%define device_mapper_version 1.02.141
|
||||
%define thin_provisioning_version 0.7.0
|
||||
### COMMON-DEF-END ###
|
||||
|
||||
Name: lvm2
|
||||
Version: %{lvm2_version}
|
||||
Release: 0
|
||||
@ -53,9 +55,9 @@ Requires(postun): coreutils
|
||||
Provides: lvm = %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%{?systemd_requires}
|
||||
|
||||
### COMMON-PATCH-BEGIN ###
|
||||
# Upstream patches
|
||||
Patch0001: bug-1033691_tests-missed-to-export-lvm-binary-for-fsadm.patch
|
||||
|
||||
# SUSE patches: 1000+ for LVM
|
||||
# Never upstream
|
||||
@ -91,35 +93,33 @@ Patch1016: lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
|
||||
|
||||
#SUSE patches 2000+ for device mapper, udev rules
|
||||
#bsc#479104,bnc#707253
|
||||
Patch2000: device-mapper-dmsetup-export.patch
|
||||
# no reference
|
||||
Patch2001: device-mapper-gcc-warnings.patch
|
||||
#bsc#724578
|
||||
Patch2002: device-mapper-link.patch
|
||||
Patch2001: device-mapper-dmsetup-export.patch
|
||||
#bnc#78902,bnc#789019,bnc#789020
|
||||
Patch2003: udev_rules-update.diff
|
||||
Patch2002: udev_rules-update.diff
|
||||
#bnc#875233
|
||||
Patch2004: udev-Check-for-DM_NR_VALID_PATHS.patch
|
||||
Patch2003: udev-Check-for-DM_NR_VALID_PATHS.patch
|
||||
#bnc909358
|
||||
Patch2005: Import-ID_FS_XXX-variables-bnc909358.patch
|
||||
Patch2004: Import-ID_FS_XXX-variables-bnc909358.patch
|
||||
#bsc#932300
|
||||
Patch2006: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
|
||||
Patch2005: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
|
||||
#bsc#940298
|
||||
Patch2007: libdm-iface-not-output-error-message-inside-retry-loop.patch
|
||||
Patch2006: libdm-iface-not-output-error-message-inside-retry-loop.patch
|
||||
#bnc#990538,bnc#986734
|
||||
Patch2008: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
|
||||
Patch2007: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
|
||||
#bsc#1012973
|
||||
Patch2009: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
|
||||
Patch2008: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
|
||||
# no reference
|
||||
Patch2009: device-mapper-gcc-warnings.patch
|
||||
### COMMON-PATCH-END ###
|
||||
|
||||
# 3000+ for test code
|
||||
#bnc#950089
|
||||
Patch3001: lvm2-testsuite.patch
|
||||
#bsc#1043040
|
||||
Patch3002: bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
|
||||
### COMMON-PATCH-END ###
|
||||
|
||||
#bsc#1037309
|
||||
Patch4001: Makefile-skip-compliling-daemons-lvmlockd-directory.patch
|
||||
Patch4001: bug-1037309_Makefile-skip-compliling-daemons-lvmlockd-directory.patch
|
||||
|
||||
%description
|
||||
Programs and man pages for configuring and using the LVM2 Logical
|
||||
@ -128,7 +128,6 @@ Volume Manager.
|
||||
%prep
|
||||
%setup -q -n LVM2.%{version}
|
||||
### COMMON-PREP-BEGIN ###
|
||||
%patch0001 -p1
|
||||
%patch1001 -p1
|
||||
%patch1002 -p1
|
||||
%patch1003 -p1
|
||||
@ -145,7 +144,6 @@ Volume Manager.
|
||||
%patch1014 -p1
|
||||
%patch1015 -p1
|
||||
%patch1016 -p1
|
||||
%patch2000 -p1
|
||||
%patch2001 -p1
|
||||
%patch2002 -p1
|
||||
%patch2003 -p1
|
||||
@ -155,10 +153,10 @@ Volume Manager.
|
||||
%patch2007 -p1
|
||||
%patch2008 -p1
|
||||
%patch2009 -p1
|
||||
%patch3001 -p1
|
||||
%patch3002 -p1
|
||||
### COMMON-PREP-END ###
|
||||
|
||||
%patch3001 -p1
|
||||
%patch3002 -p1
|
||||
%patch4001 -p1
|
||||
|
||||
%build
|
||||
@ -233,25 +231,25 @@ ln -s service %{buildroot}%{_sbindir}/rclvm2-lvmpolld
|
||||
rm %{buildroot}%{_sbindir}/dmsetup
|
||||
rm %{buildroot}%{_sbindir}/dmeventd
|
||||
rm %{buildroot}%{_sbindir}/dmstats
|
||||
rm %{buildroot}%{_mandir}/man8/dmstats.8
|
||||
rm %{buildroot}%{_mandir}/man8/dmsetup.8
|
||||
rm %{buildroot}%{_mandir}/man8/dmeventd.8
|
||||
rm %{buildroot}%{_udevrulesdir}/10-dm.rules
|
||||
rm %{buildroot}%{_udevrulesdir}/13-dm-disk.rules
|
||||
rm %{buildroot}%{_udevrulesdir}/95-dm-notify.rules
|
||||
rm %{buildroot}%{_unitdir}/dm-event.socket
|
||||
rm %{buildroot}%{_unitdir}/dm-event.service
|
||||
# See bsc#1037309 for more info
|
||||
rm %{buildroot}%{_unitdir}/lvm2-lvmlockd.service
|
||||
rm %{buildroot}%{_unitdir}/lvm2-lvmlocking.service
|
||||
rm %{buildroot}%{_includedir}/libdevmapper*.h
|
||||
rm %{buildroot}%{_libdir}/libdevmapper.so.1.03
|
||||
rm %{buildroot}%{_libdir}/libdevmapper-event.so.1.03
|
||||
rm %{buildroot}%{_libdir}/libdevmapper.so
|
||||
rm %{buildroot}%{_libdir}/libdevmapper-event.so
|
||||
rm %{buildroot}%{_includedir}/libdevmapper*.h
|
||||
rm %{buildroot}%{_libdir}/pkgconfig/devmapper*.pc
|
||||
# See bsc#1037309 for more info
|
||||
rm %{buildroot}%{_unitdir}/lvm2-lvmlockd.service
|
||||
rm %{buildroot}%{_unitdir}/lvm2-lvmlocking.service
|
||||
rm %{buildroot}%{_mandir}/man8/lvmlockctl.8
|
||||
rm %{buildroot}%{_mandir}/man8/lvmlockd.8
|
||||
rm %{buildroot}%{_mandir}/man8/dmstats.8
|
||||
rm %{buildroot}%{_mandir}/man8/dmsetup.8
|
||||
rm %{buildroot}%{_mandir}/man8/dmeventd.8
|
||||
|
||||
# compat symlinks in /sbin remove with Leap 43
|
||||
mkdir -p %{buildroot}/sbin
|
||||
|
@ -1,7 +1,7 @@
|
||||
From b17f2ae4334f9233a88d7a2fcae325f86691beb0 Mon Sep 17 00:00:00 2001
|
||||
From a83a3ec7292197bd870cae570ed545267899bc5e Mon Sep 17 00:00:00 2001
|
||||
From: Eric Ren <zren@suse.com>
|
||||
Date: Tue, 11 Apr 2017 10:44:30 +0800
|
||||
Subject: [PATCH] [PATCH 1/2] mirror: make mirror legs on different tag pvs
|
||||
Date: Tue, 4 Jul 2017 19:42:14 +0800
|
||||
Subject: [PATCH 1/2] mirror: make mirror legs on different tag pvs
|
||||
|
||||
The mirror legs could be placed on the PVs(with different tags)
|
||||
from the other mirror legs with this patch.
|
||||
@ -17,7 +17,7 @@ finding areas for parallel space, so that mirror legs will
|
||||
always be placed on pvs with differnt tags.
|
||||
|
||||
Signed-off-by: Guangliang Zhao <gzhao@suse.com>
|
||||
Fix-conflict-by: Eric Ren <zren@suse.com>
|
||||
Refreshed-by: Eric Ren <zren@suse.com>
|
||||
---
|
||||
conf/example.conf.in | 17 +++++++++++++++++
|
||||
lib/config/config_settings.h | 5 ++++-
|
||||
@ -27,7 +27,7 @@ Fix-conflict-by: Eric Ren <zren@suse.com>
|
||||
5 files changed, 64 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/conf/example.conf.in b/conf/example.conf.in
|
||||
index 614ce53..b33289f 100644
|
||||
index b5b0e6a..947a3cf 100644
|
||||
--- a/conf/example.conf.in
|
||||
+++ b/conf/example.conf.in
|
||||
@@ -372,6 +372,23 @@ allocation {
|
||||
@ -55,11 +55,11 @@ index 614ce53..b33289f 100644
|
||||
# Mirror logs and images will always use different PVs.
|
||||
# The default setting changed in version 2.02.85.
|
||||
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
|
||||
index b701722..0e5a5e2 100644
|
||||
index 40b64ab..59eed26 100644
|
||||
--- a/lib/config/config_settings.h
|
||||
+++ b/lib/config/config_settings.h
|
||||
@@ -473,7 +473,10 @@ cfg(allocation_raid_stripe_all_devices_CFG, "raid_stripe_all_devices", allocatio
|
||||
"when the command does not specify the number of stripes to use.\n"
|
||||
@@ -474,7 +474,10 @@ cfg(allocation_raid_stripe_all_devices_CFG, "raid_stripe_all_devices", allocatio
|
||||
"stripes to use.\n"
|
||||
"This was the default behaviour until release 2.02.162.\n")
|
||||
|
||||
-cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG, "cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA, CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 106), NULL, 0, NULL,
|
||||
@ -71,10 +71,10 @@ index b701722..0e5a5e2 100644
|
||||
|
||||
cfg(allocation_cache_pool_cachemode_CFG, "cache_pool_cachemode", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_CACHE_MODE, vsn(2, 2, 113), NULL, vsn(2, 2, 128),
|
||||
diff --git a/lib/config/defaults.h b/lib/config/defaults.h
|
||||
index 2340636..256fab6 100644
|
||||
index d9e19d9..e5134e4 100644
|
||||
--- a/lib/config/defaults.h
|
||||
+++ b/lib/config/defaults.h
|
||||
@@ -159,6 +159,7 @@
|
||||
@@ -161,6 +161,7 @@
|
||||
#define DEFAULT_MAX_LV 0
|
||||
#define DEFAULT_ALLOC_POLICY ALLOC_NORMAL
|
||||
#define DEFAULT_MIRROR_LOGS_REQUIRE_SEPARATE_PVS 0
|
||||
@ -83,7 +83,7 @@ index 2340636..256fab6 100644
|
||||
#define DEFAULT_CLUSTERED 0
|
||||
|
||||
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
|
||||
index 0dfbad4..357e46a 100644
|
||||
index f75cf51..8dc90b4 100644
|
||||
--- a/lib/metadata/lv_manip.c
|
||||
+++ b/lib/metadata/lv_manip.c
|
||||
@@ -1622,6 +1622,9 @@ struct alloc_handle {
|
||||
@ -157,10 +157,10 @@ index 0dfbad4..357e46a 100644
|
||||
if (mirrors || stripes)
|
||||
total_extents = new_extents;
|
||||
diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
|
||||
index 6663087..c385927 100644
|
||||
index 6b05147..7c1beab 100644
|
||||
--- a/man/lvcreate.8_pregen
|
||||
+++ b/man/lvcreate.8_pregen
|
||||
@@ -416,6 +416,13 @@ Create a raid10 LV.
|
||||
@@ -415,6 +415,13 @@ Create a raid10 LV.
|
||||
[ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
|
||||
.ad b
|
||||
.br
|
||||
|
Loading…
Reference in New Issue
Block a user