1 diff -dur LVM2.2.02.107.orig/scripts/blk_availability_init_red_hat.in LVM2.2.02.107/scripts/blk_availability_init_red_hat.in
2 --- LVM2.2.02.107.orig/scripts/blk_availability_init_red_hat.in 2014-06-23 14:07:38.000000000 +0000
3 +++ LVM2.2.02.107/scripts/blk_availability_init_red_hat.in 2014-07-25 16:24:42.989000000 +0000
8 # Copyright (C) 2012 Red Hat, Inc. All rights reserved.
18 - action "Stopping block device availability:" $sbindir/$script $options
19 + run_cmd "Stopping block device availability:" $sbindir/$script $options
28 - echo $"Usage: $0 {start|stop|status}"
29 + msg_usage "$0 {start|stop|status}"
33 diff -dur LVM2.2.02.107.orig/scripts/blk_availability_systemd_red_hat.service.in LVM2.2.02.107/scripts/blk_availability_systemd_red_hat.service.in
34 --- LVM2.2.02.107.orig/scripts/blk_availability_systemd_red_hat.service.in 2014-06-23 14:07:38.000000000 +0000
35 +++ LVM2.2.02.107/scripts/blk_availability_systemd_red_hat.service.in 2014-07-25 16:24:42.992000000 +0000
40 -ExecStart=/usr/bin/true
42 ExecStop=@sbindir@/blkdeactivate -u -l wholevg
45 diff -dur LVM2.2.02.107.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.107/scripts/clvmd_init_red_hat.in
46 --- LVM2.2.02.107.orig/scripts/clvmd_init_red_hat.in 2014-06-23 14:07:38.000000000 +0000
47 +++ LVM2.2.02.107/scripts/clvmd_init_red_hat.in 2014-07-25 16:24:42.989000000 +0000
51 if ! rh_status_q; then
52 - echo -n "Starting $DAEMON: "
53 + msg_starting "$DAEMON"
54 $DAEMON $CLVMDOPTS || return $?
58 # Refresh local cache.
61 ${lvm_vgscan} > /dev/null 2>&1
63 - action "Activating VG(s):" ${lvm_vgchange} -aay $LVM_VGS || return $?
64 + run_cmd "Activating VG(s):" ${lvm_vgchange} -aay $LVM_VGS || return $?
70 [ -z "$LVM_VGS" ] && LVM_VGS="$(clustered_vgs)"
71 if [ -n "$LVM_VGS" ]; then
72 - action "Deactivating clustered VG(s):" ${lvm_vgchange} -anl $LVM_VGS || return $?
73 + run_cmd "Deactivating clustered VG(s):" ${lvm_vgchange} -anl $LVM_VGS || return $?
76 - action "Signaling $DAEMON to exit" kill -TERM $(pidofproc $DAEMON) || return $?
77 + run_cmd "Signaling $DAEMON to exit" kill -TERM $(pidofproc $DAEMON) || return $?
79 # wait half second before we start the waiting loop or we will show
80 # the loop more time than really necessary
83 # clvmd could take some time to stop
84 - rh_status_q && action "Waiting for $DAEMON to exit:" wait_for_finish
85 + rh_status_q && run_cmd "Waiting for $DAEMON to exit:" wait_for_finish
88 - echo -n "$DAEMON failed to exit"
94 - echo -n "$DAEMON terminated"
104 rh_status_q || exit 7
105 - action "Reloading $DAEMON configuration: " $DAEMON -R || return $?
106 + run_cmd "Reloading $DAEMON configuration: " $DAEMON -R || return $?
112 # Try to get clvmd to restart itself. This will preserve
114 - action "Restarting $DAEMON: " $DAEMON -S
115 + run_cmd "Restarting $DAEMON: " $DAEMON -S
117 # If that fails then do a normal stop & restart
119 diff -dur LVM2.2.02.107.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.107/scripts/lvm2_monitoring_init_red_hat.in
120 --- LVM2.2.02.107.orig/scripts/lvm2_monitoring_init_red_hat.in 2014-06-23 14:07:38.000000000 +0000
121 +++ LVM2.2.02.107/scripts/lvm2_monitoring_init_red_hat.in 2014-07-25 16:46:56.772000000 +0000
126 # Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved.
133 + local config="'log{command_names=0 prefix=\" \"}'"
134 # TODO do we want to separate out already active groups only?
135 - VGSLIST=`$VGS --noheadings -o name --ignoreskippedcluster --config 'log{command_names=0 prefix=" "}' 2> /dev/null`
136 + VGSLIST=`eval $VGS --noheadings -o name --ignoreskippedcluster --config $config 2> /dev/null`
139 - action "Starting monitoring for VG $vg:" $VGCHANGE --monitor y --poll y --ignoreskippedcluster --config 'log{command_names=0 prefix=" "}' $vg || ret=$?
140 + run_cmd "Starting monitoring for LVM VG $vg" $VGCHANGE --monitor y --poll y --ignoreskippedcluster --config $config $vg
150 + local config="'log{command_names=0 prefix=\" \"}'"
151 # TODO do we want to separate out already active groups only?
152 if test "$WARN" = "1"; then
153 echo "Not stopping monitoring, this is a dangerous operation. Please use force-stop to override."
156 - VGSLIST=`$VGS --noheadings -o name --ignoreskippedcluster --config 'log{command_names=0 prefix=" "}' 2> /dev/null`
157 + VGSLIST=`eval $VGS --noheadings -o name --ignoreskippedcluster --config ${config} 2> /dev/null`
160 - action "Stopping monitoring for VG $vg:" $VGCHANGE --monitor n --ignoreskippedcluster --config 'log{command_names=0 prefix=" "}' $vg || ret=$?
161 + run_cmd "Stopping monitoring for LVM VG $vg" $VGCHANGE --monitor n --ignoreskippedcluster --config $config $vg