Accepting request 426139 from home:scarabeus_iv:branches:Base:System

- This is sync commit from Leap/SLE12 only
- Add patch pvcreate-enhance-the-error-message.patch bsc#960744
- Modify GPL-2.0 to GPL-2.0+ and LGPL-2.1 to LGPL-2.1+ to avoid
  license conflict with thin-provisioning-tools which is using GPL-3.0
- Also contains fix for bsc#969310
- Fix clvmd.ocf and cmirrord to remove "-d" option for cmirrod
  (bsc#971334)
- Fix clvmd.ocf to add lvmconf --enable-cluster before start daemon
  when locking_type is not 3 or use_lvmetad is 1 in setting
  (bsc#970439)
- Modified spec to enable blkid-wiping (fate#319908)
- Fix clvmd binary not found in case that users still use RA from
  ocf:lvm2:clvm (bsc#980200) 
  Add sbindir=$HA_SBIN_DIR for clvmd.ocf and cmirrord.ocf
- The bsc#979635 wnd bsc#991181 as fixed in past thanks to proper /usr
  migration code
- Modified raid10_segtype_default from "mirror" to "raid10"(bsc#982329)
- Remove lvm2-clvmd/cmirrord.service and related activation services
  from %service_add _pre/post/preun/postun because we start clvmd 
  /clmirrord and activate via pacemaker and RA. (bsc#980296)
- Lvchange improve refresh by trying to deactivate snapshot thinLV 
  in case it's preventing merge process change integrated upstream.
  (bsc#984321)
- Fixed in past bsc#992843
- Fixed by upstream bsc#984321
- Fixed by upstream bsc#970943
- 69-dm-lvm-metad.rules: Do not process rules for multipath
  devices (bsc#bsc#990538, bsc#986734)
  Add: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
- Rewrite patches to include patch header:

OBS-URL: https://build.opensuse.org/request/show/426139
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=158

clvmd.ocf

@@ -31,9 +31,12 @@
 : ${OCF_RESKEY_daemon_timeout:="80"}
 : ${OCF_RESKEY_daemon_options:="-d0"}
 
+sbindir=$HA_SBIN_DIR
+
 # Common variables
-DAEMON="/usr/sbin/clvmd"
-CMIRRORD="/usr/sbin/cmirrord"
+DAEMON="${sbindir}/clvmd"
+CMIRRORD="${sbindir}/cmirrord"
+LVMCONF="${sbindir}/lvmconf"
 
 status_daemons()
 {
@@ -100,7 +103,7 @@ bringup_cmirrord()
 	return $OCF_ERR_INSTALLED
     fi
 
-    start_daemon "$CMIRRORD" "$OCF_RESKEY_daemon_options"; rc=$?
+    start_daemon "$CMIRRORD"; rc=$?
     if [ $rc != 0 ]; then
 	ocf_log err "Could not start $CMIRRORD"
 	return $OCF_ERR_GENERIC
@@ -198,6 +201,11 @@ clvmd_start()
 	clvmd_validate
 	ocf_log info "Starting $OCF_RESOURCE_INSTANCE"
 
+    # autoset locking type to clusted when lvmconf tool is available
+    if [ -x "$LVMCONF"  ]; then
+        $LVMCONF --enable-cluster > /dev/null 2>&1
+    fi  
+
 	status_clvmd; rc=$?
     if [ $rc == $OCF_NOT_RUNNING ]; then 
       bringup_clvmd; rc=$?
@@ -294,7 +302,7 @@ Number of seconds to allow the control daemon to come up and down
 Options to clvmd. Refer to clvmd.8 for detailed descriptions.
       </longdesc>
       <shortdesc lang="en">Daemon Options</shortdesc>
-      <content type="string" default="-d2"/>
+      <content type="string" default="-d0"/>
     </parameter>