X-Git-Url: https://git.tld-linux.org/?p=packages%2Flvm2.git;a=blobdiff_plain;f=lvm2-tld_init.patch;h=66326de7e71a892ab57bfe0aa6c75f0f7d8e5f2a;hp=d8ee8b6739a101ce90d2702c173088fd339db6d5;hb=8780299f67c78624188b5a2a8d85e69e6724be4a;hpb=aef0eae05381d3cde014fc4cd09fa61acd7ca4b9 diff --git a/lvm2-tld_init.patch b/lvm2-tld_init.patch index d8ee8b6..66326de 100644 --- a/lvm2-tld_init.patch +++ b/lvm2-tld_init.patch @@ -1,52 +1,61 @@ -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 +diff -urp LVM2.2.02.177.orig/scripts/blk_availability_init_red_hat.in LVM2.2.02.177/scripts/blk_availability_init_red_hat.in +--- LVM2.2.02.177.orig/scripts/blk_availability_init_red_hat.in 2017-12-18 20:44:35.000000000 +0000 ++++ LVM2.2.02.177/scripts/blk_availability_init_red_hat.in 2018-01-29 11:24:46.012906501 +0000 @@ -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 -m disablequeueing" +DAEMON="blkdeactivate" +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.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 +diff -urp LVM2.2.02.177.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.177/scripts/clvmd_init_red_hat.in +--- LVM2.2.02.177.orig/scripts/clvmd_init_red_hat.in 2017-12-18 20:44:35.000000000 +0000 ++++ LVM2.2.02.177/scripts/clvmd_init_red_hat.in 2018-01-29 12:54:59.156583852 +0000 +@@ -4,7 +4,7 @@ + # + # chkconfig: - 24 76 + # description: Cluster daemon for userland logical volume management tools. +-# pidfile: @CLVMD_PIDFILE@ ++# pidfile: /var/run/clvmd.pid + # + # For Red-Hat-based distributions such as Fedora, RHEL, CentOS. + # @@ -18,15 +18,12 @@ . /etc/rc.d/init.d/functions @@ -54,13 +63,13 @@ diff -ur LVM2.2.02.162.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.162/scripts/ -DAEMON=clvmd +DAEMON="clvmd" --exec_prefix=@exec_prefix@ --sbindir=@sbindir@ +-sbindir="@SBINDIR@" +-usrsbindir="@USRSBINDIR@" - --lvm_vgchange=${sbindir}/vgchange --lvm_vgs=${sbindir}/vgs --lvm_vgscan=${sbindir}/vgscan --lvm_lvs=${sbindir}/lvs +-lvm_vgchange="$sbindir/vgchange" +-lvm_vgs="$sbindir/vgs" +-lvm_vgscan="$sbindir/vgscan" +-lvm_lvs="$sbindir/lvs" +lvm_vgchange="/sbin/vgchange" +lvm_vgs="/sbin/vgs" +lvm_vgscan="/sbin/vgscan" @@ -68,12 +77,12 @@ diff -ur LVM2.2.02.162.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.162/scripts/ CLVMDOPTS="-T30" -@@ -50,20 +47,11 @@ - ${lvm_lvs} --noheadings -o lv_name -S 'vg_clustered=1 && lv_active!=""' 2>/dev/null +@@ -50,20 +47,11 @@ clustered_active_lvs() { + "$lvm_lvs" --noheadings -o lv_name -S 'vg_clustered=1 && lv_active!=""' 2>/dev/null } -rh_status() { -- status $DAEMON +- status "$DAEMON" -} - -rh_status_q() { @@ -84,22 +93,23 @@ diff -ur LVM2.2.02.162.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.162/scripts/ { - if ! rh_status_q; then - echo -n "Starting $DAEMON: " +- "$usrsbindir/$DAEMON" $CLVMDOPTS || return $? +- echo + if ! status $DAEMON 1>/dev/null 2>&1; then + msg_starting "$DAEMON" - $DAEMON $CLVMDOPTS || return $? -- echo ++ "$DAEMON" $CLVMDOPTS || return $? fi # Refresh local cache. -@@ -82,74 +70,62 @@ +@@ -82,74 +70,60 @@ start() # unnecessary warnings. - ${lvm_vgscan} > /dev/null 2>&1 + "$lvm_vgscan" > /dev/null 2>&1 - -- action "Activating VG(s):" ${lvm_vgchange} -aay $LVM_VGS || return $? +- action "Activating VG(s):" "$lvm_vgchange" -aay $LVM_VGS || return $? - + run_cmd "Activating VG(s):" ${lvm_vgchange} -aay $LVM_VGS || return $? - touch $LOCK_FILE + touch "$LOCK_FILE" - return 0 } @@ -121,16 +131,16 @@ diff -ur LVM2.2.02.162.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.162/scripts/ stop() { - rh_status_q || return 0 +- + status $DAEMON 1>/dev/null 2>&1 || return 0 - [ -z "$LVM_VGS" ] && LVM_VGS="$(clustered_vgs)" if [ -n "$LVM_VGS" ]; then -- action "Deactivating clustered VG(s):" ${lvm_vgchange} -anl $LVM_VGS || return $? +- 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 $? +- +- 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 @@ -154,16 +164,16 @@ diff -ur LVM2.2.02.162.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.162/scripts/ + ok fi - - rm -f $LOCK_FILE + rm -f "$LOCK_FILE" - return 0 } reload() { - rh_status_q || exit 7 -- action "Reloading $DAEMON configuration: " $DAEMON -R || return $? +- action "Reloading $DAEMON configuration: " "$usrsbindir/$DAEMON" -R || return $? + status $DAEMON 1>/dev/null 2>&1 || exit 7 -+ run_cmd "Reloading $DAEMON configuration: " $DAEMON -R || return $? ++ run_cmd "Reloading $DAEMON configuration: " "$DAEMON" -R || return $? } restart() { @@ -175,12 +185,12 @@ diff -ur LVM2.2.02.162.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.162/scripts/ # Try to get clvmd to restart itself. This will preserve # exclusive LV locks -- action "Restarting $DAEMON: " $DAEMON -S -+ run_cmd "Restarting $DAEMON: " $DAEMON -S +- action "Restarting $DAEMON: " "$usrsbindir/$DAEMON" -S ++ run_cmd "Restarting $DAEMON: " "$DAEMON" -S # If that fails then do a normal stop & restart if [ $? != 0 ]; then -@@ -166,49 +142,43 @@ +@@ -166,38 +140,39 @@ restart() { exit 4 } @@ -192,47 +202,46 @@ diff -ur LVM2.2.02.162.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.162/scripts/ - rtrn=$? + RETVAL=$? ;; -- + stop) stop - rtrn=$? + RETVAL=$? ;; -- + restart|force-reload) restart - rtrn=$? + RETVAL=$? ;; -- + condrestart|try-restart) - rh_status_q || exit 0 + status $DAEMON 1>/dev/null 2>&1 || exit 0 restart - rtrn=$? -+ RETVAL=$? ++ RETVAL=$? ;; -- + reload) reload - rtrn=$? + RETVAL=$? ;; -- + status) - rh_status - rtrn=$? -- if [ $rtrn = 0 ]; then +- if [ "$rtrn" = 0 ]; then + status $DAEMON + RETVAL=$? + if [ $RETVAL = 0 ]; then cvgs="$(clustered_vgs)" echo Clustered Volume Groups: ${cvgs:-"(none)"} clvs="$(clustered_active_lvs)" - echo Active clustered Logical Volumes: ${clvs:-"(none)"} - fi +@@ -206,9 +181,9 @@ case "$1" in ;; -- + *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - rtrn=2 @@ -240,19 +249,150 @@ diff -ur LVM2.2.02.162.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.162/scripts/ + RETVAL=2 ;; esac + +-exit $rtrn ++exit $RETVAL +diff -urp LVM2.2.02.177.orig/scripts/cmirrord_init_red_hat.in LVM2.2.02.177/scripts/cmirrord_init_red_hat.in +--- LVM2.2.02.177.orig/scripts/cmirrord_init_red_hat.in 2017-12-18 20:44:35.000000000 +0000 ++++ LVM2.2.02.177/scripts/cmirrord_init_red_hat.in 2018-01-29 11:28:49.069892013 +0000 +@@ -2,7 +2,7 @@ + # + # chkconfig: - 22 78 + # description: Starts and stops cmirrord +-# pidfile: @CMIRRORD_PIDFILE@ ++# pidfile: /var/run/cmirrord.pid + # + # For Red-Hat-based distributions such as Fedora, RHEL, CentOS. + # +@@ -16,95 +16,57 @@ + + . /etc/init.d/functions + +-DAEMON=cmirrord ++DAEMON="cmirrord" + +-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 +- +- return $rtrn ++ if [ -f $LOCK_FILE ]; then ++ msg_already_running "$DAEMON" ++ return ++ fi ++ msg_starting "$DAEMON" ++ daemon /sbin/$DAEMON /dev/null 2>&1 +-} +LOCK_FILE="/var/lock/subsys/lvm2-lvmetad" - PID_FILE="@LVMETAD_PIDFILE@" ++PID_FILE="/var/run/lvmetad.pid" --rh_status() { -- status -p $PID_FILE $DAEMON -+start() { -+ if [ -f $LOCK_FILE ]; then + start() + { +- ret=0 +- action "Starting LVM metadata daemon:" "$sbindir/$DAEMON" || ret=$? +- return $ret ++ 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 ++ msg_starting "$NAME" ++ daemon "/sbin/$DAEMON" /dev/null 2>&1 +-} +LOCK_FILE="/var/lock/subsys/lvm2-lvmpolld" - PID_FILE="@LVMPOLLD_PIDFILE@" ++PID_FILE="/var/run/lvmpolld.pid" --rh_status() { -- status -p $PID_FILE $DAEMON -+start() { + start() + { +- ret=0 +- action "Starting LVM poll daemon:" "$sbindir/$DAEMON" || ret=$? +- return $ret + 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 ++ 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 @@ -599,8 +740,8 @@ diff -ur LVM2.2.02.162.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.16 + 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 } @@ -612,37 +753,37 @@ diff -ur LVM2.2.02.162.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.16 case "$1" in start) - rh_status_q && exit 0 -+ status $DMEVENTD_DAEMON 1>/dev/null 2>&1 && 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 1>/dev/null 2>&1 || 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 1>/dev/null 2>&1 || 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 @@ -651,23 +792,27 @@ diff -ur LVM2.2.02.162.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.16 - 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