X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=lvm2-tld_init.patch;h=8acc383e5025a888f039d62d1896dd6c5b76b800;hb=b98e08f5dcb6f7b822bf7c030f620d654a34a6f4;hp=3d9f95a04351ebc2a21d6f53001fd26d45903643;hpb=014e74153e9ccd17578b56aac2fb70a7d09765b5;p=packages%2Flvm2.git

diff --git a/lvm2-tld_init.patch b/lvm2-tld_init.patch
index 3d9f95a..8acc383 100644
--- a/lvm2-tld_init.patch
+++ b/lvm2-tld_init.patch
@@ -245,7 +245,7 @@ diff -ur LVM2.2.02.132.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.132/scripts/
 +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-05 12:31:30.993042000 +0000
++++ LVM2.2.02.132/scripts/lvm2_lvmetad_init_red_hat.in	2015-10-06 06:06:01.799042000 +0000
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -257,23 +257,24 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmetad_init_red_hat.in LVM2.2.02.132/s
  . /etc/init.d/functions
  
 -DAEMON=lvmetad
--
--exec_prefix=@exec_prefix@
--sbindir=@sbindir@
 +DAEMON="lvmetad"
 +NAME="LVM metadata daemon"
  
- LOCK_FILE="/var/lock/subsys/$DAEMON"
+-exec_prefix=@exec_prefix@
+-sbindir=@sbindir@
+-
+-LOCK_FILE="/var/lock/subsys/$DAEMON"
++LOCK_FILE="/var/lock/subsys/lvm2-lvmetad"
  PID_FILE="@LVMETAD_PIDFILE@"
  
 -rh_status() {
 -	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
@@ -283,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
  }
@@ -298,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
@@ -314,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=$?
  }
@@ -380,7 +381,7 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmetad_init_red_hat.in LVM2.2.02.132/s
 +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-05 12:31:30.993042000 +0000
++++ LVM2.2.02.132/scripts/lvm2_lvmpolld_init_red_hat.in	2015-10-06 06:07:04.889042000 +0000
 @@ -1,6 +1,6 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -405,23 +406,24 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmpolld_init_red_hat.in LVM2.2.02.132/
  . /etc/init.d/functions
  
 -DAEMON=lvmpolld
--
--exec_prefix=@exec_prefix@
--sbindir=@sbindir@
 +DAEMON="lvmpolld"
 +NAME="LVM poll daemon"
  
- LOCK_FILE="/var/lock/subsys/$DAEMON"
+-exec_prefix=@exec_prefix@
+-sbindir=@sbindir@
+-
+-LOCK_FILE="/var/lock/subsys/$DAEMON"
++LOCK_FILE="/var/lock/subsys/lvm2-lvmpolld"
  PID_FILE="@LVMPOLLD_PIDFILE@"
  
 -rh_status() {
 -	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
@@ -431,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
  }
@@ -446,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
@@ -462,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=$?
  }