X-Git-Url: https://git.tld-linux.org/?p=packages%2Flvm2.git;a=blobdiff_plain;f=lvm2-tld_init.patch;h=83b42eb1e8a9728ad8ec65e39c2843f254f09f81;hp=bfaea6f9046351349eddf2f4549c52cbe5046580;hb=fdec89449c51ab3141aab0dc9a49bf2326ec355e;hpb=bf0e149a8b30880914b7ce3b57c4b85cd0ce7905 diff --git a/lvm2-tld_init.patch b/lvm2-tld_init.patch index bfaea6f..83b42eb 100644 --- a/lvm2-tld_init.patch +++ b/lvm2-tld_init.patch @@ -1,261 +1,183 @@ -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 11:36:09.176042000 +0000 +diff -ur LVM2.2.03.02.orig/scripts/blk_availability_init_red_hat.in LVM2.2.03.02/scripts/blk_availability_init_red_hat.in +--- LVM2.2.03.02.orig/scripts/blk_availability_init_red_hat.in 2019-03-22 17:01:45.758000000 +0100 ++++ LVM2.2.03.02/scripts/blk_availability_init_red_hat.in 2019-03-22 17:01:58.006000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # - # Copyright (C) 2012 Red Hat, Inc. All rights reserved. + # Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved. # -@@ -31,28 +31,26 @@ +@@ -31,26 +31,29 @@ . /etc/init.d/functions --sbindir=@sbindir@ -script=blkdeactivate --options="-u -l wholevg" +DAEMON="blkdeactivate" -+OPTIONS="-u -l wholevg" ++OPTIONS="-u -l wholevg -m disablequeueing" - LOCK_FILE="/var/lock/subsys/blk-availability" - -- --rtrn=1 +-sbindir=@SBINDIR@ +-options="-u -l wholevg -m disablequeueing -r wait" - +-LOCK_FILE="@DEFAULT_LOCK_DIR@/subsys/blk-availability" ++LOCK_FILE="/var/lock/subsys/blk-availability" + case "$1" in start) - touch $LOCK_FILE + touch "$LOCK_FILE" + exit 0 ;; -- + stop) -- action "Stopping block device availability:" $sbindir/$script $options -+ run_cmd "Stopping block device availability:" /sbin/$DAEMON $OPTIONS - rm -f $LOCK_FILE +- action "Stopping block device availability:" "$sbindir/$script" $options ++ run_cmd "Stopping block device availability:" "/sbin/$DAEMON" $OPTIONS + rm -f "$LOCK_FILE" + exit 0 ;; -- + status) + exit 0 ;; ++ *) - echo $"Usage: $0 {start|stop|status}" + msg_usage "$0 {start|stop|status}" + 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 09:44:25.805042000 +0000 -@@ -61,9 +61,8 @@ - start() - { - if ! rh_status_q; then -- echo -n "Starting $DAEMON: " -+ msg_starting "$DAEMON" - $DAEMON $CLVMDOPTS || return $? -- echo - fi - - # Refresh local cache. -@@ -83,7 +82,7 @@ - - ${lvm_vgscan} > /dev/null 2>&1 - -- action "Activating VG(s):" ${lvm_vgchange} -aay $LVM_VGS || return $? -+ run_cmd "Activating VG(s):" ${lvm_vgchange} -aay $LVM_VGS || return $? - - touch $LOCK_FILE - -@@ -108,27 +107,23 @@ - - [ -z "$LVM_VGS" ] && LVM_VGS="$(clustered_vgs)" - if [ -n "$LVM_VGS" ]; then -- action "Deactivating clustered VG(s):" ${lvm_vgchange} -anl $LVM_VGS || return $? -+ run_cmd "Deactivating clustered VG(s):" ${lvm_vgchange} -anl $LVM_VGS || return $? - fi - -- action "Signaling $DAEMON to exit" kill -TERM $(pidofproc $DAEMON) || return $? -+ run_cmd "Signaling $DAEMON to exit" kill -TERM $(pidofproc $DAEMON) || return $? - - # wait half second before we start the waiting loop or we will show - # the loop more time than really necessary - usleep 500000 - - # clvmd could take some time to stop -- rh_status_q && action "Waiting for $DAEMON to exit:" wait_for_finish -+ rh_status_q && run_cmd "Waiting for $DAEMON to exit:" wait_for_finish - - if rh_status_q; then -- echo -n "$DAEMON failed to exit" -- failure -- echo -+ fail - return 1 - else -- echo -n "$DAEMON terminated" -- success -- echo -+ ok - fi - - rm -f $LOCK_FILE -@@ -138,7 +133,7 @@ - - reload() { - rh_status_q || exit 7 -- action "Reloading $DAEMON configuration: " $DAEMON -R || return $? -+ run_cmd "Reloading $DAEMON configuration: " $DAEMON -R || return $? - } - - restart() { -@@ -149,7 +144,7 @@ - - # Try to get clvmd to restart itself. This will preserve - # exclusive LV locks -- action "Restarting $DAEMON: " $DAEMON -S -+ run_cmd "Restarting $DAEMON: " $DAEMON -S - - # If that fails then do a normal stop & restart - if [ $? != 0 ]; then -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 11:12:06.584042000 +0000 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh +diff -ur LVM2.2.03.02.orig/scripts/cmirrord_init_red_hat.in LVM2.2.03.02/scripts/cmirrord_init_red_hat.in +--- LVM2.2.03.02.orig/scripts/cmirrord_init_red_hat.in 2019-03-22 17:01:45.758000000 +0100 ++++ LVM2.2.03.02/scripts/cmirrord_init_red_hat.in 2019-03-22 17:01:58.006000000 +0100 +@@ -2,7 +2,7 @@ + # + # chkconfig: - 22 78 + # description: Starts and stops cmirrord +-# pidfile: @CMIRRORD_PIDFILE@ ++# pidfile: /var/run/cmirrord.pid # - # Copyright (C) 2012 Red Hat, Inc. All rights reserved. + # For Red-Hat-based distributions such as Fedora, RHEL, CentOS. # -@@ -33,80 +33,76 @@ +@@ -16,95 +16,57 @@ . /etc/init.d/functions --DAEMON=lvmetad -- --exec_prefix=@exec_prefix@ --sbindir=@sbindir@ -+DAEMON="lvmetad" -+NAME="LVM metadata daemon" - - LOCK_FILE="/var/lock/subsys/$DAEMON" - PID_FILE="@LVMETAD_PIDFILE@" - --rh_status() { -- status -p $PID_FILE $DAEMON -+start() { -+ if [ -f $LOCK_FILE ]; then -+ msg_already_running $NAME -+ return -+ fi -+ msg_starting $NAME -+ daemon /sbin/$DAEMON /dev/null 2>&1 -+stop() { -+ if [ ! -f $LOCK_FILE ]; then -+ msg_not_running $NAME -+ return -+ fi -+ msg_stopping $NAME -+ killproc --pidfile $PID_FILE $DAEMON -+ rm -f $LOCK_FILE - } +-DAEMON=cmirrord ++DAEMON="cmirrord" --start() --{ -- ret=0 -- action "Starting LVM metadata daemon:" $DAEMON || ret=$? -- return $ret -+condrestart() { -+ if [ ! -f $LOCK_FILE ]; then -+ msg_not_running $NAME -+ RETVAL=$1 -+ return -+ fi -+ stop -+ start - } +-usrsbindir="@USRSBINDIR@" +- +-LOCK_FILE="@DEFAULT_SYS_LOCK_DIR@/subsys/$DAEMON" ++LOCK_FILE="/var/lock/subsys/$DAEMON" + start() + { +- rtrn=0 +- if ! pidof "$DAEMON" > /dev/null +- then +- echo -n "Starting $DAEMON: " +- daemon "$usrsbindir/$DAEMON" +- rtrn=$? +- echo +- fi - --stop() --{ -- ret=0 -- action "Signaling LVM metadata daemon to exit:" killproc -p $PID_FILE $DAEMON -TERM || ret=$? -- return $ret -+reload() { -+ if [ ! -f $LOCK_FILE ]; then -+ msg_not_running $NAME -+ RETVAL=7 +- return $rtrn ++ if [ -f $LOCK_FILE ]; then ++ msg_already_running "$DAEMON" + return + fi -+ msg_reloading $NAME -+ killproc $DAEMON -HUP ++ msg_starting "$DAEMON" ++ daemon /sbin/$DAEMON /dev/null 2>&1 -+stop() { -+ if [ ! -f $LOCK_FILE ]; then -+ msg_not_running $NAME -+ return -+ fi -+ msg_stopping $NAME -+ killproc --pidfile $PID_FILE $DAEMON -+ rm -f $LOCK_FILE - } +-} ++LOCK_FILE="/var/lock/subsys/lvm2-lvmpolld" ++PID_FILE="/var/run/lvmpolld.pid" --start() --{ + start() + { - ret=0 -- action "Starting LVM poll daemon:" $DAEMON || ret=$? +- action "Starting LVM poll daemon:" "$sbindir/$DAEMON" || ret=$? - return $ret -+condrestart() { -+ if [ ! -f $LOCK_FILE ]; then -+ msg_not_running $NAME -+ RETVAL=$1 -+ return -+ fi -+ stop -+ start ++ if [ -f $LOCK_FILE ]; then ++ msg_already_running "$NAME" ++ return ++ fi ++ msg_starting "$NAME" ++ daemon "/sbin/$DAEMON" /dev/null` for vg in $VGSLIST do -- action "Starting monitoring for VG $vg:" $VGCHANGE --monitor y --poll y --ignoreskippedcluster --config 'log{command_names=0 prefix=" "}' $vg || ret=$? -+ run_cmd "Starting monitoring for LVM VG $vg" $VGCHANGE --monitor y --poll y --ignoreskippedcluster --config $config $vg +- action "Starting monitoring for VG $vg:" "$VGCHANGE" --monitor y --poll y --ignoreskippedcluster --config 'log{command_names=0 prefix=" "}' $vg || ret=$? ++ run_cmd "Starting monitoring for LVM VG $vg" $VGCHANGE --monitor y --poll y --ignoreskippedcluster --config $config $vg done - - return $ret @@ -472,8 +396,8 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.13 + VGSLIST=`eval $VGS --noheadings -o name --ignoreskippedcluster --config ${config} 2> /dev/null` for vg in $VGSLIST do -- action "Stopping monitoring for VG $vg:" $VGCHANGE --monitor n --ignoreskippedcluster --config 'log{command_names=0 prefix=" "}' $vg || ret=$? -+ run_cmd "Stopping monitoring for LVM VG $vg" $VGCHANGE --monitor n --ignoreskippedcluster --config $config $vg +- action "Stopping monitoring for VG $vg:" "$VGCHANGE" --monitor n --ignoreskippedcluster --config 'log{command_names=0 prefix=" "}' $vg || ret=$? ++ run_cmd "Stopping monitoring for LVM VG $vg" $VGCHANGE --monitor n --ignoreskippedcluster --config $config $vg done - return $ret } @@ -485,37 +409,37 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.13 case "$1" in start) - rh_status_q && exit 0 -+ status $DMEVENTD_DAEMON || exit 0 ++ status "$DMEVENTD_DAEMON" 1>/dev/null 2>&1 && exit 0 start - rtrn=$? -- [ $rtrn = 0 ] && touch $LOCK_FILE +- [ "$rtrn" = 0 ] && touch "$LOCK_FILE" + RETVAL=$? -+ [ $RETVAL = 0 ] && touch $LOCK_FILE ++ [ "$RETVAL" = 0 ] && touch "$LOCK_FILE" ;; -- + force-stop) - rh_status_q || exit 0 -+ status $DMEVENTD_DAEMON || exit 0 ++ status "$DMEVENTD_DAEMON" 1>/dev/null 2>&1 || exit 0 WARN=0 stop - rtrn=$? -- [ $rtrn = 0 ] && rm -f $LOCK_FILE +- [ "$rtrn" = 0 ] && rm -f "$LOCK_FILE" + RETVAL=$? -+ [ $RETVAL = 0 ] && rm -f $LOCK_FILE ++ [ "$RETVAL" = 0 ] && rm -f "$LOCK_FILE" ;; -- + stop) - rh_status_q || exit 0 -+ status $DMEVENTD_DAEMON || exit 0 ++ status "$DMEVENTD_DAEMON" 1>/dev/null 2>&1 || exit 0 test "$runlevel" = "0" && WARN=0 test "$runlevel" = "6" && WARN=0 stop - rtrn=$? -- [ $rtrn = 0 ] && rm -f $LOCK_FILE +- [ "$rtrn" = 0 ] && rm -f "$LOCK_FILE" + RETVAL=$? -+ [ $RETVAL = 0 ] && rm -f $LOCK_FILE ++ [ "$RETVAL" = 0 ] && rm -f "$LOCK_FILE" ;; -- + restart) WARN=0 - if stop @@ -524,23 +448,27 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.13 - fi - rtrn=$? + stop ++ RETVAL=$? ++ [ "$RETVAL" = 0 ] && rm -f "$LOCK_FILE" + start ++ RETVAL=$? ++ [ "$RETVAL" = 0 ] && touch "$LOCK_FILE" ;; -- + status) - rh_status - rtrn=$? -- [ $rtrn = 0 ] && $LVS -S 'seg_monitor=monitored' -o lv_full_name,seg_monitor -+ status $DMEVENTD_DAEMON +- [ "$rtrn" = 0 ] && "$LVS" -S 'seg_monitor=monitored' -o lv_full_name,seg_monitor ++ status "$DMEVENTD_DAEMON" + RETVAL=$? -+ [ $RETVAL = 0 ] && $LVS -S 'seg_monitor=monitored' -o lv_full_name,seg_monitor ++ [ "$RETVAL" = 0 ] && $LVS -S 'seg_monitor=monitored' -o lv_full_name,seg_monitor ;; -- + *) - echo $"Usage: $0 {start|stop|restart|status|force-stop}" + msg_usage "$0 {start|stop|restart|status|force-stop}" ;; esac -- + -exit $rtrn +exit $RETVAL