Hello community,

here is the log from the commit of package lvm2 for openSUSE:Factory checked in 
at 2014-12-05 21:07:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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        2014-11-24 
11:15:51.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.lvm2.new/lvm2.changes   2014-12-05 
21:07:24.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Dec  3 03:23:47 UTC 2014 - je...@suse.com
+
+- Update to 2.02.114
+  - Removed cmirrord-fix-s390-endian-issue.patch
+  - Renumbered patches to allow for upstream patches to be applied
+    before local ones.
+
+-------------------------------------------------------------------

Old:
----
  LVM2.2.02.111.tgz
  LVM2.2.02.111.tgz.asc
  cmirrord-fix-s390-endian-issue.patch

New:
----
  LVM2.2.02.114.tgz
  LVM2.2.02.114.tgz.asc

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lvm2.spec ++++++
--- /var/tmp/diff_new_pack.22Vzu4/_old  2014-12-05 21:07:27.000000000 +0100
+++ /var/tmp/diff_new_pack.22Vzu4/_new  2014-12-05 21:07:27.000000000 +0100
@@ -16,8 +16,8 @@
 #
 
 
-%define lvm2_version              2.02.111
-%define device_mapper_version     1.02.90
+%define lvm2_version              2.02.114
+%define device_mapper_version     1.02.92
 %define thin_provisioning_version 0.4.1
 
 Url:            http://www.sourceware.org/lvm2/
@@ -49,53 +49,54 @@
 Source16:       csm-converter.tar.gz
 Source50:       thin-provisioning-tools-v%{thin_provisioning_version}.tar.gz
 
-Patch1:         improve_probing.diff
-Patch2:         no-inc-audit.diff
-Patch3:         no_buildroot_shared.diff
-Patch4:         sys_mount_instead_linux_fs.diff
+# Upstream patches first
+# (currently none)
+
+# SUSE patches 1000- for LVM, 2000- for device mapper
+Patch1001:      improve_probing.diff
+Patch1002:      no-inc-audit.diff
+Patch1003:      no_buildroot_shared.diff
+Patch1004:      sys_mount_instead_linux_fs.diff
 
 #suse
-Patch5:         display-dm-name-for-lv-name.diff
-Patch6:         device-mapper-type_punning.diff
+Patch1005:      display-dm-name-for-lv-name.diff
+Patch1006:      device-mapper-type_punning.diff
 
 #fate312248, patch6,7
-Patch7:         make-mirror-legs-on-different-tag-pvs.patch
-Patch8:         improve-mirror-legs-on-different-tag-pvs.patch
+Patch1007:      make-mirror-legs-on-different-tag-pvs.patch
+Patch1008:      improve-mirror-legs-on-different-tag-pvs.patch
 
 #fate#315092
-Patch9:         cmirrord_improvment_performance.patch
+Patch1009:      cmirrord_improvment_performance.patch
 
 #fate#314367, patch10,11
-Patch10:        cluster_support_mirrord_log.diff
-Patch11:        lvconvert-cluster-mirrored-disk-failed.patch
+Patch1010:      cluster_support_mirrord_log.diff
+Patch1011:      lvconvert-cluster-mirrored-disk-failed.patch
 
 #forward-port from sle11
-Patch12:        suppress_format1_size_warning.diff
-Patch13:        pvmove_support_clustered_vg.diff
+Patch1012:      suppress_format1_size_warning.diff
+Patch1013:      pvmove_support_clustered_vg.diff
 
 # Never upstream
-Patch14:        cmirrord_remove_date_time_from_compilation.patch
+Patch1014:      cmirrord_remove_date_time_from_compilation.patch
 
 #suse, bnc873538
-Patch15:        fix-closedown-before-thread-finish.patch
+Patch1015:      fix-closedown-before-thread-finish.patch
 #suse, bnc#870824
-Patch16:        use-mirrortype-asdefault-whenclvmdrunning.patch
-
-Patch17:        version-plugins-in-libdir
+Patch1016:      use-mirrortype-asdefault-whenclvmdrunning.patch
 
-#suse, bnc#890452,bnc#893684 
-Patch18:        cmirrord-fix-s390-endian-issue.patch
+Patch1017:      version-plugins-in-libdir
 
 # device-mapper patches
 #suse, bnc#707253(also merged patch for bnc#479104)
-Patch200:       device-mapper-dmsetup-export.patch
-Patch201:       device-mapper-gcc-warnings.patch
-Patch202:       device-mapper-static.patch
-Patch203:       device-mapper-link
+Patch2000:      device-mapper-dmsetup-export.patch
+Patch2001:      device-mapper-gcc-warnings.patch
+Patch2002:      device-mapper-static.patch
+Patch2003:      device-mapper-link
 #suse, bnc#78902,bnc#789019,bnc#789020
-Patch204:       udev_rules-update.diff
+Patch2004:      udev_rules-update.diff
 #suse, bnc#875233
-Patch205:       udev-Check-for-DM_NR_VALID_PATHS.patch
+Patch2005:      udev-Check-for-DM_NR_VALID_PATHS.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Not a real replacement but we drop evms
@@ -120,31 +121,30 @@
 
 %prep
 %setup -q -n LVM2.%{version} -a 50  -a 16 
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-
-%patch200 -p1
-%patch201 -p1
-%patch202 -p1
-%patch203 -p1
-%patch204 -p1
-%patch205 -p1
+%patch1001 -p1
+%patch1002 -p1
+%patch1003 -p1
+%patch1004 -p1
+%patch1005 -p1
+%patch1006 -p1
+%patch1007 -p1
+%patch1008 -p1
+%patch1009 -p1
+%patch1010 -p1
+%patch1011 -p1
+%patch1012 -p1
+%patch1013 -p1
+%patch1014 -p1
+%patch1015 -p1
+%patch1016 -p1
+%patch1017 -p1
+
+%patch2000 -p1
+%patch2001 -p1
+%patch2002 -p1
+%patch2003 -p1
+%patch2004 -p1
+%patch2005 -p1
 
 %build
 #set path so that thin_check can be found
@@ -386,6 +386,7 @@
 %{_mandir}/man8/pvresize.8.gz
 %{_mandir}/man8/pvs.8.gz
 %{_mandir}/man8/pvscan.8.gz
+%{_mandir}/man7/lvmcache.7.gz
 %{_mandir}/man8/vgcfgbackup.8.gz
 %{_mandir}/man8/vgcfgrestore.8.gz
 %{_mandir}/man8/vgchange.8.gz

++++++ LVM2.2.02.111.tgz -> LVM2.2.02.114.tgz ++++++
++++ 32803 lines of diff (skipped)

++++++ cluster_support_mirrord_log.diff ++++++
--- /var/tmp/diff_new_pack.22Vzu4/_old  2014-12-05 21:07:27.000000000 +0100
+++ /var/tmp/diff_new_pack.22Vzu4/_new  2014-12-05 21:07:27.000000000 +0100
@@ -453,7 +453,7 @@
 -      if (vg_is_clustered(lv->vg)) {
 -              /* FIXME: move this test out of this function */
 -              /* Skip test for pvmove mirrors, it can use local mirror */
--              if (!(lv->status & (PVMOVE | LOCKED)) &&
+-              if (!lv_is_pvmove(lv) && !lv_is_locked(lv) &&
 -                  lv_is_active(lv) &&
 -                  !lv_is_active_exclusive_locally(lv) && /* 
lv_is_active_remotely */
 -                  !_cluster_mirror_is_available(lv)) {
@@ -495,18 +495,18 @@
 --- a/tools/lvconvert.c
 +++ b/tools/lvconvert.c
 @@ -1364,15 +1364,6 @@ static int _lvconvert_mirrors_parse_para
-               return 0;
-       }
+       *new_log_count = arg_int_value(cmd, mirrorlog_ARG,
+                                      arg_is_set(cmd, corelog_ARG) ? 
MIRROR_LOG_CORE : DEFAULT_MIRRORLOG);
  
 -      /*
 -       * No mirrored logs for cluster mirrors until
 -       * log daemon is multi-threaded.
 -       */
--      if ((*new_log_count == 2) && vg_is_clustered(lv->vg)) {
+-      if ((*new_log_count == MIRROR_LOG_MIRRORED) && vg_is_clustered(lv->vg)) 
{
 -              log_error("Log type, \"mirrored\", is unavailable to cluster 
mirrors");
 -              return 0;
 -      }
 -
-       log_verbose("Setting logging type to %s", mirrorlog);
+       log_verbose("Setting logging type to %s", 
get_mirror_log_name(*new_log_count));
  
        /*

++++++ make-mirror-legs-on-different-tag-pvs.patch ++++++
--- /var/tmp/diff_new_pack.22Vzu4/_old  2014-12-05 21:07:27.000000000 +0100
+++ /var/tmp/diff_new_pack.22Vzu4/_new  2014-12-05 21:07:27.000000000 +0100
@@ -59,8 +59,8 @@
  cfg(allocation_mirror_logs_require_separate_pvs_CFG, 
"mirror_logs_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, 
DEFAULT_MIRROR_LOGS_REQUIRE_SEPARATE_PVS, vsn(2, 2, 85), NULL)
 +cfg(allocation_mirror_legs_require_separate_pvs_CFG, 
"mirror_legs_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, 
DEFAULT_MIRROR_LEGS_REQUIRE_SEPARATE_PVS, vsn(2, 2, 98), NULL)
  cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG, 
"cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, 0, 
CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 
106), NULL)
+ cfg(allocation_cache_pool_cachemode_CFG, "cache_pool_cachemode", 
allocation_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_CACHE_POOL_CACHEMODE, 
vsn(2, 2, 113), NULL)
  cfg_runtime(allocation_cache_pool_chunk_size_CFG, "cache_pool_chunk_size", 
allocation_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_INT, vsn(2, 2, 106), 
NULL)
- cfg(allocation_thin_pool_metadata_require_separate_pvs_CFG, 
"thin_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, 0, 
CFG_TYPE_BOOL, DEFAULT_THIN_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 89), 
NULL)
 --- a/lib/config/defaults.h
 +++ b/lib/config/defaults.h
 @@ -125,6 +125,7 @@
@@ -147,13 +147,13 @@
 --- a/man/lvcreate.8.in
 +++ b/man/lvcreate.8.in
 @@ -284,6 +284,10 @@ will create a persistent log that is its
- 
- When the legacy "mirror" segment type is used, the optional argument
- \fB\-\-corelog\fP is equivalent to \fB\-\-mirrorlog\fP \fIcore\fP.
-+
+ Using \fIcore\fP means the mirror is regenerated by copying the data
+ from the first device each time the logical volume is activated,
+ like after every reboot.
++.br
 +Every leg of the mirrored logical volume could be placed on the pvs with
 +same tag, see details(mirror_legs_require_separate_pvs) in lvm.conf.
 +
+ .br
+ Using \fImirrored\fP will create a persistent log that is itself mirrored.
  .TP
- .BR \-\-metadataprofile " " \fIProfileName
- Uses and attaches the ProfileName configuration profile to the logical

++++++ use-mirrortype-asdefault-whenclvmdrunning.patch ++++++
--- /var/tmp/diff_new_pack.22Vzu4/_old  2014-12-05 21:07:27.000000000 +0100
+++ /var/tmp/diff_new_pack.22Vzu4/_new  2014-12-05 21:07:27.000000000 +0100
@@ -30,25 +30,15 @@
 +       return (lock.l_type == F_UNLCK) ? 0 : 1;
 +}
 +
- static int _lvcreate_params(struct lvcreate_params *lp,
-                           struct lvcreate_cmdline_params *lcp,
-                           struct cmd_context *cmd,
-@@ -860,14 +882,16 @@ static int _lvcreate_params(struct lvcre
- 
-       /* Set default segtype - remember, '-m 0' implies stripe. */
-       if (arg_count(cmd, mirrors_ARG) &&
--          arg_uint_value(cmd, mirrors_ARG, 0))
-+          arg_uint_value(cmd, mirrors_ARG, 0)) {
-               if (arg_uint_value(cmd, arg_count(cmd, stripes_long_ARG) ?
-                                  stripes_long_ARG : stripes_ARG, 1) > 1) {
-                       segtype_str = find_config_tree_str(cmd, 
global_raid10_segtype_default_CFG, NULL);;
-               } else {
-                       segtype_str = find_config_tree_str(cmd, 
global_mirror_segtype_default_CFG, NULL);
-               }
--      else if (arg_count(cmd, thin_ARG) || arg_count(cmd, thinpool_ARG))
+ static int _lvcreate_params(struct cmd_context *cmd,
+                           int argc, char **argv,
+                           struct lvcreate_params *lp,
+@@ -860,6 +882,8 @@ static int _lvcreate_params(struct lvcre
+               mirror_default_cfg = (arg_uint_value(cmd, stripes_ARG, 1) > 1)
+                       ? global_raid10_segtype_default_CFG : 
global_mirror_segtype_default_CFG;
+               segtype_str = find_config_tree_str(cmd, mirror_default_cfg, 
NULL);
 +              if(clvmd_daemon_is_running())
 +                      segtype_str = "mirror";
-+      } else if (arg_count(cmd, thin_ARG) || arg_count(cmd, thinpool_ARG))
-               segtype_str = "thin";
-       else if (arg_count(cmd, cache_ARG) || arg_count(cmd, cachepool_ARG))
-               segtype_str = "cache";
+       } else
+               segtype_str = "striped";
+ 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to