- updated to 2.02.162, partial PLD merge (patches)

[packages/lvm2.git] / lvm2-tld_init.patch

diff --git a/lvm2-tld_init.patch b/lvm2-tld_init.patch
index b34ec12ec59ac72c712f63d033feabcceb799b6e..d8ee8b6739a101ce90d2702c173088fd339db6d5 100644 (file)
--- a/lvm2-tld_init.patch
+++ b/lvm2-tld_init.patch
@@ -1,6 +1,6 @@
-diff -ur LVM2.2.02.132.orig/scripts/blk_availability_init_red_hat.in LVM2.2.02.132/scripts/blk_availability_init_red_hat.in
---- LVM2.2.02.132.orig/scripts/blk_availability_init_red_hat.in        2015-09-22 15:00:59.000000000 +0000
-+++ LVM2.2.02.132/scripts/blk_availability_init_red_hat.in     2015-10-05 12:31:30.991042000 +0000
+diff -ur LVM2.2.02.162.orig/scripts/blk_availability_init_red_hat.in LVM2.2.02.162/scripts/blk_availability_init_red_hat.in
+--- LVM2.2.02.162.orig/scripts/blk_availability_init_red_hat.in        2016-07-28 18:50:18.000000000 +0000
++++ LVM2.2.02.162/scripts/blk_availability_init_red_hat.in     2016-08-04 16:26:04.886554000 +0000
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -13,9 +13,9 @@ diff -ur LVM2.2.02.132.orig/scripts/blk_availability_init_red_hat.in LVM2.2.02.1
  
 -sbindir=@sbindir@
 -script=blkdeactivate
--options="-u -l wholevg"
+-options="-u -l wholevg -m disablequeueing"
 +DAEMON="blkdeactivate"
-+OPTIONS="-u -l wholevg"
++OPTIONS="-u -l wholevg -m disablequeueing"
  
  LOCK_FILE="/var/lock/subsys/blk-availability"
  
@@ -44,9 +44,9 @@ diff -ur LVM2.2.02.132.orig/scripts/blk_availability_init_red_hat.in LVM2.2.02.1
 +      exit 3
        ;;
  esac
-diff -ur LVM2.2.02.132.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.132/scripts/clvmd_init_red_hat.in
---- LVM2.2.02.132.orig/scripts/clvmd_init_red_hat.in   2015-09-22 15:00:59.000000000 +0000
-+++ LVM2.2.02.132/scripts/clvmd_init_red_hat.in        2015-10-05 19:20:56.249042000 +0000
+diff -ur LVM2.2.02.162.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.162/scripts/clvmd_init_red_hat.in
+--- LVM2.2.02.162.orig/scripts/clvmd_init_red_hat.in   2016-07-28 18:50:18.000000000 +0000
++++ LVM2.2.02.162/scripts/clvmd_init_red_hat.in        2016-08-04 16:22:09.076554000 +0000
 @@ -18,15 +18,12 @@
  
  . /etc/rc.d/init.d/functions
@@ -243,9 +243,9 @@ diff -ur LVM2.2.02.132.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.132/scripts/
 -
 -exit $rtrn
 +exit $RETVAL
-diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmetad_init_red_hat.in LVM2.2.02.132/scripts/lvm2_lvmetad_init_red_hat.in
---- LVM2.2.02.132.orig/scripts/lvm2_lvmetad_init_red_hat.in    2015-09-22 15:00:59.000000000 +0000
-+++ LVM2.2.02.132/scripts/lvm2_lvmetad_init_red_hat.in 2015-10-06 06:06:01.799042000 +0000
+diff -ur LVM2.2.02.162.orig/scripts/lvm2_lvmetad_init_red_hat.in LVM2.2.02.162/scripts/lvm2_lvmetad_init_red_hat.in
+--- LVM2.2.02.162.orig/scripts/lvm2_lvmetad_init_red_hat.in    2016-07-28 18:50:18.000000000 +0000
++++ LVM2.2.02.162/scripts/lvm2_lvmetad_init_red_hat.in 2016-08-04 16:22:09.077554000 +0000
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -271,10 +271,10 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmetad_init_red_hat.in LVM2.2.02.132/s
 -      status -p $PID_FILE $DAEMON
 +start() {
 +      if [ -f $LOCK_FILE ]; then
-+              msg_already_running $NAME
++              msg_already_running "$NAME"
 +              return
 +      fi
-+        msg_starting $NAME
++        msg_starting "$NAME"
 +        daemon /sbin/$DAEMON </dev/null
 +        RETVAL=$?
 +        [ $RETVAL -eq 0 ] && touch $LOCK_FILE
@@ -284,10 +284,10 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmetad_init_red_hat.in LVM2.2.02.132/s
 -      rh_status >/dev/null 2>&1
 +stop() {
 +        if [ ! -f $LOCK_FILE ]; then
-+                msg_not_running $NAME
++                msg_not_running "$NAME"
 +                return
 +        fi
-+        msg_stopping $NAME
++        msg_stopping "$NAME"
 +        killproc --pidfile $PID_FILE $DAEMON
 +        rm -f $LOCK_FILE
  }
@@ -299,7 +299,7 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmetad_init_red_hat.in LVM2.2.02.132/s
 -      return $ret
 +condrestart() {
 +        if [ ! -f $LOCK_FILE ]; then
-+                msg_not_running $NAME
++                msg_not_running "$NAME"
 +                RETVAL=$1
 +                return
 +        fi
@@ -315,11 +315,11 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmetad_init_red_hat.in LVM2.2.02.132/s
 -      return $ret
 +reload() {
 +        if [ ! -f $LOCK_FILE ]; then
-+                msg_not_running $NAME
++                msg_not_running "$NAME"
 +                RETVAL=7
 +                return
 +        fi
-+        msg_reloading $NAME
++        msg_reloading "$NAME"
 +        killproc $DAEMON -HUP
 +        RETVAL=$?
  }
@@ -379,9 +379,9 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmetad_init_red_hat.in LVM2.2.02.132/s
 -
 -exit $rtrn
 +exit $RETVAL
-diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmpolld_init_red_hat.in LVM2.2.02.132/scripts/lvm2_lvmpolld_init_red_hat.in
---- LVM2.2.02.132.orig/scripts/lvm2_lvmpolld_init_red_hat.in   2015-09-22 15:00:59.000000000 +0000
-+++ LVM2.2.02.132/scripts/lvm2_lvmpolld_init_red_hat.in        2015-10-06 06:07:04.889042000 +0000
+diff -ur LVM2.2.02.162.orig/scripts/lvm2_lvmpolld_init_red_hat.in LVM2.2.02.162/scripts/lvm2_lvmpolld_init_red_hat.in
+--- LVM2.2.02.162.orig/scripts/lvm2_lvmpolld_init_red_hat.in   2016-07-28 18:50:18.000000000 +0000
++++ LVM2.2.02.162/scripts/lvm2_lvmpolld_init_red_hat.in        2016-08-04 16:22:09.077554000 +0000
 @@ -1,6 +1,6 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -420,10 +420,10 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmpolld_init_red_hat.in LVM2.2.02.132/
 -      status -p $PID_FILE $DAEMON
 +start() {
 +      if [ -f $LOCK_FILE ]; then
-+              msg_already_running $NAME
++              msg_already_running "$NAME"
 +              return
 +      fi
-+        msg_starting $NAME
++        msg_starting "$NAME"
 +        daemon /sbin/$DAEMON </dev/null
 +        RETVAL=$?
 +        [ $RETVAL -eq 0 ] && touch $LOCK_FILE
@@ -433,10 +433,10 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmpolld_init_red_hat.in LVM2.2.02.132/
 -      rh_status >/dev/null 2>&1
 +stop() {
 +        if [ ! -f $LOCK_FILE ]; then
-+                msg_not_running $NAME
++                msg_not_running "$NAME"
 +                return
 +        fi
-+        msg_stopping $NAME
++        msg_stopping "$NAME"
 +        killproc --pidfile $PID_FILE $DAEMON
 +        rm -f $LOCK_FILE
  }
@@ -448,7 +448,7 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmpolld_init_red_hat.in LVM2.2.02.132/
 -      return $ret
 +condrestart() {
 +        if [ ! -f $LOCK_FILE ]; then
-+                msg_not_running $NAME
++                msg_not_running "$NAME"
 +                RETVAL=$1
 +                return
 +        fi
@@ -464,11 +464,11 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmpolld_init_red_hat.in LVM2.2.02.132/
 -      return $ret
 +reload() {
 +        if [ ! -f $LOCK_FILE ]; then
-+                msg_not_running $NAME
++                msg_not_running "$NAME"
 +                RETVAL=7
 +                return
 +        fi
-+        msg_reloading $NAME
++        msg_reloading "$NAME"
 +        killproc $DAEMON -HUP
 +        RETVAL=$?
  }
@@ -528,9 +528,9 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmpolld_init_red_hat.in LVM2.2.02.132/
 -
 -exit $rtrn
 +exit $RETVAL
-diff -ur LVM2.2.02.132.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.132/scripts/lvm2_monitoring_init_red_hat.in
---- LVM2.2.02.132.orig/scripts/lvm2_monitoring_init_red_hat.in 2015-09-22 15:00:59.000000000 +0000
-+++ LVM2.2.02.132/scripts/lvm2_monitoring_init_red_hat.in      2015-10-05 12:32:01.204042000 +0000
+diff -ur LVM2.2.02.162.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.162/scripts/lvm2_monitoring_init_red_hat.in
+--- LVM2.2.02.162.orig/scripts/lvm2_monitoring_init_red_hat.in 2016-07-28 18:50:18.000000000 +0000
++++ LVM2.2.02.162/scripts/lvm2_monitoring_init_red_hat.in      2016-08-04 16:22:09.078554000 +0000
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh