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-2017 Red Hat, Inc. All rights reserved. # @@ -31,26 +31,29 @@ . /etc/init.d/functions -script=blkdeactivate +DAEMON="blkdeactivate" +OPTIONS="-u -l wholevg -m disablequeueing" -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" + exit 0 ;; stop) - 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.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 # # 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-lvmpolld" +PID_FILE="/var/run/lvmpolld.pid" 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 -} start() { - ret=0 + local config="'log{command_names=0 prefix=\" \"}'" # TODO do we want to separate out already active groups only? - VGSLIST=`$VGS --noheadings -o name --ignoreskippedcluster --config 'log{command_names=0 prefix=" "}' 2> /dev/null` + VGSLIST=`eval $VGS --noheadings -o name --ignoreskippedcluster --config $config 2> /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 done - - return $ret } stop() { - ret=0 + local config="'log{command_names=0 prefix=\" \"}'" # TODO do we want to separate out already active groups only? if test "$WARN" = "1"; then echo "Not stopping monitoring, this is a dangerous operation. Please use force-stop to override." return 1 fi - VGSLIST=`$VGS --noheadings -o name --ignoreskippedcluster --config 'log{command_names=0 prefix=" "}' 2> /dev/null` + 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 done - return $ret } -rtrn=1 - +RETVAL=0 # See how we were called. case "$1" in start) - rh_status_q && exit 0 + status "$DMEVENTD_DAEMON" 1>/dev/null 2>&1 && exit 0 start - rtrn=$? - [ "$rtrn" = 0 ] && touch "$LOCK_FILE" + RETVAL=$? + [ "$RETVAL" = 0 ] && touch "$LOCK_FILE" ;; force-stop) - rh_status_q || exit 0 + status "$DMEVENTD_DAEMON" 1>/dev/null 2>&1 || exit 0 WARN=0 stop - rtrn=$? - [ "$rtrn" = 0 ] && rm -f "$LOCK_FILE" + RETVAL=$? + [ "$RETVAL" = 0 ] && rm -f "$LOCK_FILE" ;; stop) - rh_status_q || 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" + RETVAL=$? + [ "$RETVAL" = 0 ] && rm -f "$LOCK_FILE" ;; restart) WARN=0 - if stop - then - start - 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" + RETVAL=$? + [ "$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