From 6e5934db47b7aa7f6396b56924bade7e7b648140889e65d954d0b1d6d7429e33 Mon Sep 17 00:00:00 2001 From: Eric ren Date: Fri, 24 Nov 2017 11:13:44 +0000 Subject: [PATCH] Accepting request 545140 from network:ha-clustering:Unstable - Update to LVM2.2.02.176 - Drop: bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch - Refresh: fate-31841_fsadm-add-support-for-btrfs.patch - Update to LVM2.2.02.176 - Drop: bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch - Refresh: fate-31841_fsadm-add-support-for-btrfs.patch - Update to LVM2.2.02.176 - Drop: bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch - Refresh: fate-31841_fsadm-add-support-for-btrfs.patch OBS-URL: https://build.opensuse.org/request/show/545140 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=209 --- LVM2.2.02.175.tgz | 3 -- LVM2.2.02.175.tgz.asc | 7 --- LVM2.2.02.176.tgz | 3 ++ LVM2.2.02.176.tgz.asc | 7 +++ ...service-add-Also-lvm2-lvmetad.socket.patch | 33 ------------- device-mapper.changes | 7 +++ device-mapper.spec | 11 ++--- fate-31841_fsadm-add-support-for-btrfs.patch | 49 ++++++++++--------- lvm2-clvm.changes | 7 +++ lvm2-clvm.spec | 11 ++--- lvm2.changes | 7 +++ lvm2.spec | 11 ++--- 12 files changed, 68 insertions(+), 88 deletions(-) delete mode 100644 LVM2.2.02.175.tgz delete mode 100644 LVM2.2.02.175.tgz.asc create mode 100644 LVM2.2.02.176.tgz create mode 100644 LVM2.2.02.176.tgz.asc delete mode 100644 bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch diff --git a/LVM2.2.02.175.tgz b/LVM2.2.02.175.tgz deleted file mode 100644 index a1f377f..0000000 --- a/LVM2.2.02.175.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4db7a3ec6d082be212f759279b54bcdfd3c3797a5ea67605746049b004632559 -size 2373834 diff --git a/LVM2.2.02.175.tgz.asc b/LVM2.2.02.175.tgz.asc deleted file mode 100644 index cd9f8bb..0000000 --- a/LVM2.2.02.175.tgz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEABECAAYFAlnX9XgACgkQIoGRwVZ+LBeZnQCg7JNQyFkEkfNptzLGNCVLlA2S -77oAoPAYBrpUR+ID/KAH6+MkNU9bmTK4 -=0AnW ------END PGP SIGNATURE----- diff --git a/LVM2.2.02.176.tgz b/LVM2.2.02.176.tgz new file mode 100644 index 0000000..b6a22cf --- /dev/null +++ b/LVM2.2.02.176.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dece83628c2c78a267a126ce6046d506582185ae5d40fb8d59b56547fccea473 +size 2371438 diff --git a/LVM2.2.02.176.tgz.asc b/LVM2.2.02.176.tgz.asc new file mode 100644 index 0000000..e807a18 --- /dev/null +++ b/LVM2.2.02.176.tgz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEABECAAYFAln78m4ACgkQIoGRwVZ+LBd7JgCgrSwgbcu9Q3DcMlgQ6cKWuw7A +OJUAn2ZLtu42YBXsqlxSbfS4/KTWBroE +=iUwm +-----END PGP SIGNATURE----- diff --git a/bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch b/bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch deleted file mode 100644 index b22a707..0000000 --- a/bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4b846bba24f8458130fa951f9248a7540084f641 Mon Sep 17 00:00:00 2001 -From: Liuhua Wang -Date: Tue, 29 Dec 2015 15:15:27 +0800 -Subject: [PATCH] lvm2-lvmetad.service add Also=lvm2-lvmetad.socket - -In order to avoid lvm2-lvmetad.service being activated when package -updating due to `systemctl restart/try-restart .socket` results in -corresponding service being activeted, we removed lvm2-lvmetad.socket -from %preun and %postun(bsc#914415), which causes brokent lvm2-lvmetad -.socket symbolic link left when package being uninstalled. - -Add 'Also=lvm2-lvmetad.socket' in '[Install]' section of lvm2-lvmetad. -service to remove lvm2-lvmetad.socket when disable lvm2-lvmetad.service. - -References: bsc#960044 -Signed-off-by: lwang@suse.com ---- - scripts/lvm2_lvmetad_systemd_red_hat.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/scripts/lvm2_lvmetad_systemd_red_hat.service.in b/scripts/lvm2_lvmetad_systemd_red_hat.service.in -index 8f4c60d..1deca87 100644 ---- a/scripts/lvm2_lvmetad_systemd_red_hat.service.in -+++ b/scripts/lvm2_lvmetad_systemd_red_hat.service.in -@@ -15,4 +15,5 @@ Restart=on-abort - PIDFile=@LVMETAD_PIDFILE@ - - [Install] -+Also=lvm2-lvmetad.socket - WantedBy=sysinit.target --- -1.8.4.5 - diff --git a/device-mapper.changes b/device-mapper.changes index 198c88f..e33d7ab 100644 --- a/device-mapper.changes +++ b/device-mapper.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 21 09:29:02 UTC 2017 - zren@suse.com + +- Update to LVM2.2.02.176 +- Drop: bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch +- Refresh: fate-31841_fsadm-add-support-for-btrfs.patch + ------------------------------------------------------------------- Thu Nov 2 12:48:23 UTC 2017 - zren@suse.com diff --git a/device-mapper.spec b/device-mapper.spec index c6c572f..dc8940c 100644 --- a/device-mapper.spec +++ b/device-mapper.spec @@ -19,8 +19,8 @@ %define libname libdevmapper1_03 %define libname_event libdevmapper-event1_03 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.175 -%define device_mapper_version 1.02.144 +%define lvm2_version 2.02.176 +%define device_mapper_version 1.02.145 %define thin_provisioning_version 0.7.0 ### COMMON-DEF-END ### Name: device-mapper @@ -57,12 +57,10 @@ Patch1002: fate-309425_display-dm-name-for-lv-name.patch Patch1003: fate-31841_fsadm-add-support-for-btrfs.patch #bsc#935623 Patch1004: bug-935623_dmeventd-fix-dso-name-wrong-compare.patch -#bsc#960044 -Patch1005: bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch #SUSE patches 2000+ for device mapper, udev rules #bsc#1012973 -Patch2006: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch +Patch2001: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch ### COMMON-PATCH-END ### %description @@ -75,8 +73,7 @@ Programs and man pages for configuring and using the device mapper. %patch1002 -p1 %patch1003 -p1 %patch1004 -p1 -%patch1005 -p1 -%patch2006 -p1 +%patch2001 -p1 ### COMMON-PREP-END ### %build diff --git a/fate-31841_fsadm-add-support-for-btrfs.patch b/fate-31841_fsadm-add-support-for-btrfs.patch index c04281f..f1eed1a 100644 --- a/fate-31841_fsadm-add-support-for-btrfs.patch +++ b/fate-31841_fsadm-add-support-for-btrfs.patch @@ -1,4 +1,4 @@ -From ecc163a3cb10a8ad89a445ec9d6fdb5a30c380de Mon Sep 17 00:00:00 2001 +From 701999ed1d48cadb34084253c698fb9b45763499 Mon Sep 17 00:00:00 2001 From: Eric Ren Date: Thu, 6 Jul 2017 17:42:58 +0800 Subject: [PATCH] fsadm: add support for btrfs @@ -9,11 +9,11 @@ Reisze: find the mount point first and resize the filesystem after get the device id since there are maybe several devices underneath btrfs filesystem --- - scripts/fsadm.sh | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 71 insertions(+), 3 deletions(-) + scripts/fsadm.sh | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 72 insertions(+), 3 deletions(-) diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh -index 459905f..1219549 100755 +index 4f402ce..6501e34 100755 --- a/scripts/fsadm.sh +++ b/scripts/fsadm.sh @@ -22,6 +22,7 @@ @@ -24,15 +24,15 @@ index 459905f..1219549 100755 # # Return values: # 0 success -@@ -56,6 +57,7 @@ FSCK=fsck - XFS_CHECK=xfs_check +@@ -57,6 +58,7 @@ XFS_CHECK=xfs_check # XFS_REPAIR -n is used when XFS_CHECK is not found XFS_REPAIR=xfs_repair + CRYPTSETUP=cryptsetup +BTRFS=btrfs # user may override lvm location by setting LVM_BINARY LVM=${LVM_BINARY:-lvm} -@@ -75,6 +77,9 @@ BLOCKCOUNT= +@@ -76,6 +78,9 @@ BLOCKCOUNT= MOUNTPOINT= MOUNTED= REMOUNT= @@ -42,7 +42,7 @@ index 459905f..1219549 100755 PROCDIR="/proc" PROCMOUNTS="$PROCDIR/mounts" PROCSELFMOUNTINFO="$PROCDIR/self/mountinfo" -@@ -225,6 +230,33 @@ detect_fs() { +@@ -227,6 +232,33 @@ detect_fs() { verbose "\"$FSTYPE\" filesystem found on \"$VOLUME\"." } @@ -76,7 +76,7 @@ index 459905f..1219549 100755 # Check that passed mounted MAJOR:MINOR is not matching $MAJOR:MINOR of resized $VOLUME validate_mounted_major_minor() { -@@ -352,8 +384,12 @@ detect_mounted_with_proc_mounts() { +@@ -354,8 +386,12 @@ detect_mounted_with_proc_mounts() { # check if the given device is already mounted and where # FIXME: resolve swap usage and device stacking @@ -91,8 +91,8 @@ index 459905f..1219549 100755 detect_mounted_with_proc_self_mountinfo elif test -e "$PROCMOUNTS"; then detect_mounted_with_proc_mounts -@@ -520,6 +556,31 @@ resize_xfs() { - fi +@@ -654,6 +690,32 @@ resize_crypt() { + dry $CRYPTSETUP resize "$1" --size $CRYPT_RESIZE_BLOCKS || error "$CRYPTSETUP failed to resize device $1" } +######################## @@ -120,31 +120,32 @@ index 459905f..1219549 100755 + verbose "Resizing filesystem on device \"$VOLUME\" to $NEWSIZE bytes(btrfs devid: $BTRFS_DEVID) " + dry "$BTRFS" filesystem resize "$BTRFS_DEVID":"$NEWSIZE" "$MOUNTPOINT" +} ++ #################### # Resize filesystem #################### -@@ -536,6 +597,7 @@ resize() { - "ext3"|"ext2"|"ext4") resize_ext $NEWSIZE ;; - "reiserfs") resize_reiser $NEWSIZE ;; - "xfs") resize_xfs $NEWSIZE ;; +@@ -676,6 +738,7 @@ resize() { + "crypto_LUKS") + which $CRYPTSETUP > /dev/null 2>&1 || error "$CRYPTSETUP utility required to resize LUKS volume" + resize_luks $NEWSIZE ;; + "btrfs") resize_btrfs $NEWSIZE ;; *) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;; esac || error "Resize $FSTYPE failed." - cleanup 0 -@@ -593,6 +655,12 @@ check() { - # Think about better way.... - dry "$XFS_REPAIR" -n -o force_geometry "$VOLUME" - fi ;; + test -z "$CRYPT_SHRINK" || resize_crypt "$VOLUME_ORIG" +@@ -748,6 +811,12 @@ check() { + "crypto_LUKS") + which $CRYPTSETUP > /dev/null 2>&1 || error "$CRYPTSETUP utility required." + check_luks ;; + "btrfs") #mount the device first and then run scrub + MOUNTPOINT=$TEMPDIR + temp_mount || error "Cannot mount btrfs filesystem" + dry "$BTRFS" scrub start -B "$VOLUME" + test "$MOUNTPOINT" = "$TEMPDIR" && MOUNTPOINT="" temp_umount + ;; - *) # check if executed from interactive shell environment - case "$-" in - *i*) dry "$FSCK" $YES $FORCE "$VOLUME" ;; -@@ -614,7 +682,7 @@ test -n "$FSADM_RUNNING" && exit 0 + *) + error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;; + esac +@@ -766,7 +835,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" \ diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes index 198c88f..e33d7ab 100644 --- a/lvm2-clvm.changes +++ b/lvm2-clvm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 21 09:29:02 UTC 2017 - zren@suse.com + +- Update to LVM2.2.02.176 +- Drop: bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch +- Refresh: fate-31841_fsadm-add-support-for-btrfs.patch + ------------------------------------------------------------------- Thu Nov 2 12:48:23 UTC 2017 - zren@suse.com diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec index 91a3a83..259bbdc 100644 --- a/lvm2-clvm.spec +++ b/lvm2-clvm.spec @@ -19,8 +19,8 @@ %define dlm_version 3.99.1 %define sanlock_version 3.3.0 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.175 -%define device_mapper_version 1.02.144 +%define lvm2_version 2.02.176 +%define device_mapper_version 1.02.145 %define thin_provisioning_version 0.7.0 ### COMMON-DEF-END ### Name: lvm2-clvm @@ -58,12 +58,10 @@ Patch1002: fate-309425_display-dm-name-for-lv-name.patch Patch1003: fate-31841_fsadm-add-support-for-btrfs.patch #bsc#935623 Patch1004: bug-935623_dmeventd-fix-dso-name-wrong-compare.patch -#bsc#960044 -Patch1005: bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch #SUSE patches 2000+ for device mapper, udev rules #bsc#1012973 -Patch2006: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch +Patch2001: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch ### COMMON-PATCH-END ### %description @@ -77,8 +75,7 @@ A daemon for using LVM2 Logival Volumes in a clustered environment. %patch1002 -p1 %patch1003 -p1 %patch1004 -p1 -%patch1005 -p1 -%patch2006 -p1 +%patch2001 -p1 ### COMMON-PREP-END ### %build diff --git a/lvm2.changes b/lvm2.changes index 198c88f..e33d7ab 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 21 09:29:02 UTC 2017 - zren@suse.com + +- Update to LVM2.2.02.176 +- Drop: bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch +- Refresh: fate-31841_fsadm-add-support-for-btrfs.patch + ------------------------------------------------------------------- Thu Nov 2 12:48:23 UTC 2017 - zren@suse.com diff --git a/lvm2.spec b/lvm2.spec index b00df09..906a5ac 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -21,8 +21,8 @@ %define cmdlib liblvm2cmd2_02 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.175 -%define device_mapper_version 1.02.144 +%define lvm2_version 2.02.176 +%define device_mapper_version 1.02.145 %define thin_provisioning_version 0.7.0 ### COMMON-DEF-END ### @@ -68,12 +68,10 @@ Patch1002: fate-309425_display-dm-name-for-lv-name.patch Patch1003: fate-31841_fsadm-add-support-for-btrfs.patch #bsc#935623 Patch1004: bug-935623_dmeventd-fix-dso-name-wrong-compare.patch -#bsc#960044 -Patch1005: bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch #SUSE patches 2000+ for device mapper, udev rules #bsc#1012973 -Patch2006: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch +Patch2001: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch ### COMMON-PATCH-END ### # 3000+ for test code @@ -95,8 +93,7 @@ Volume Manager. %patch1002 -p1 %patch1003 -p1 %patch1004 -p1 -%patch1005 -p1 -%patch2006 -p1 +%patch2001 -p1 ### COMMON-PREP-END ### %patch3001 -p1