commit lvm2 for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package lvm2 for openSUSE:Factory checked in at 2015-04-10 09:49:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lvm2 (Old) and /work/SRC/openSUSE:Factory/.lvm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lvm2" Changes: -------- --- /work/SRC/openSUSE:Factory/lvm2/lvm2.changes 2015-03-29 20:16:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lvm2.new/lvm2.changes 2015-04-10 09:49:06.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 3 02:45:02 UTC 2015 - lzhong@suse.com + +- fsadm: add support for btrfs(fate#318413) + fsadm-add-support-for-btrfs.patch + +------------------------------------------------------------------- @@ -6,0 +13,6 @@ + +------------------------------------------------------------------- +Sat Feb 14 14:06:36 UTC 2015 - i@marguerite.su + +- provides libdevmapper.so.1.02 libdevmapper-event.so.1.02 + for VirtualBox. New: ---- fsadm-add-support-for-btrfs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.bAvdJ0/_old 2015-04-10 09:49:07.000000000 +0200 +++ /var/tmp/diff_new_pack.bAvdJ0/_new 2015-04-10 09:49:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package lvm2 # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -88,6 +88,7 @@ Patch2005: udev-Check-for-DM_NR_VALID_PATHS.patch # suse, boo#910327 Patch2006: lvm2-do-not-strip-pdata_tools.patch +Patch2007: fsadm-add-support-for-btrfs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -149,6 +150,7 @@ %patch2004 -p1 %patch2005 -p1 %patch2006 -p1 +%patch2007 -p1 %build #set path so that thin_check can be found @@ -223,6 +225,13 @@ install -m755 -D %{S:8} "%buildroot/%_prefix/lib/ocf/resource.d/lvm2/clvmd" install -m755 -D %{S:10} "%buildroot/%_prefix/lib/ocf/resource.d/lvm2/cmirrord" +# Make sure libdevmapper.so.1.02 libdevmapper-event.so.1.02 still available +# on Tumbleweed, as virtualbox.org didn't update their RPMs yet. +rm -f libdm/ioctl/libdevmapper.so daemons/dmeventd/libdevmapper-event.so +sed -i "s/1.03.01/%{device_mapper_version}/" VERSION_DM +make device-mapper +make install_device-mapper DESTDIR=%{buildroot} + pushd "%buildroot/%_lib" ln -sf liblvm2cmd.so.2.02 liblvm2cmd.so ln -sf liblvm2app.so.2.2 liblvm2app.so @@ -461,6 +470,8 @@ %doc udev/12-dm-permissions.rules /%_lib/libdevmapper.so.1.03 /%_lib/libdevmapper-event.so.1.03 +/%_lib/libdevmapper.so.1.02 +/%_lib/libdevmapper-event.so.1.02 /sbin/dmsetup /sbin/dmeventd %_sbindir/thin_* ++++++ fsadm-add-support-for-btrfs.patch ++++++
From 67a7538475e9e292103a80fed8cff8ab380314a2 Mon Sep 17 00:00:00 2001 From: Lidong Zhong
Date: Fri, 6 Mar 2015 18:35:04 +0800 Subject: [Patch v2] fsadm: add support for btrfs
Check: mount the device first and then run`btrfs filesystem scrub start
-B` command
Reisze: find the mount point first and resize the filesystem after get
the device id since there are maybe several devices underneath btrfs
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.
Regards,
Lidong
scripts/fsadm.sh | 104 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 88 insertions(+), 16 deletions(-)
diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh
index f4ea796..765f9dc 100755
--- a/scripts/fsadm.sh
+++ b/scripts/fsadm.sh
@@ -22,6 +22,7 @@
# ext2/ext3/ext4: resize2fs, tune2fs
# reiserfs: resize_reiserfs, reiserfstune
# xfs: xfs_growfs, xfs_info
+# btrfs: btrfs
#
# Return values:
# 0 success
@@ -56,6 +57,7 @@ FSCK=fsck
XFS_CHECK=xfs_check
# XFS_REPAIR -n is used when XFS_CHECK is not found
XFS_REPAIR=xfs_repair
+BTRFS=btrfs
# user may override lvm location by setting LVM_BINARY
LVM=${LVM_BINARY:-lvm}
@@ -75,6 +77,9 @@ BLOCKCOUNT=
MOUNTPOINT=
MOUNTED=
REMOUNT=
+FINDMNT=
+UUID=
+BTRFS_DEVID=
PROCMOUNTS="/proc/mounts"
NULL="$DM_DEV_DIR/null"
@@ -147,7 +152,7 @@ cleanup() {
export _FSADM_YES _FSADM_EXTOFF
unset FSADM_RUNNING
test -n "$LVM_BINARY" && PATH=$_SAVEPATH
- dry exec "$LVM" lvresize $VERB $FORCE -r -L${NEWSIZE}b "$VOLUME_ORIG"
+ dry exec "$LVM" lvresize $VERB $FORCE -r -L${NEWSIZE}b "$VOLUME"
fi
# error exit status for break
@@ -198,27 +203,62 @@ detect_fs() {
verbose "\"$FSTYPE\" filesystem found on \"$VOLUME\""
}
+check_findmnt() {
+ FINDMNT=$(which findmnt 2>$NULL)
+ test -n "$FINDMNT"
+}
+
+detect_fs_uuid() {
+ UUID=$($BLKID -o value -c $NULL -s UUID "$VOLUME" 2>$NULL)
+ test -n "$UUID"
+}
+
+#find the mountpoint of this device
+detect_mounted_findmnt() {
+ local TMP
+ local STR_IFS=$IFS
+ IFS=" $(echo -n -e '\t')"
+
+ read -r TMP<
participants (1)
-
root@hilbert.suse.de