lvm2-clvmd_init.patch

   1 --- LVM2.2.02.67/scripts/clvmd_init_red_hat.in  2010-07-17 18:33:02.185014713 +0200
   2 +++ LVM2.2.02.67/scripts/clvmd_init_red_hat.in  2010-07-17 18:59:14.831553676 +0200
   3 @@ -64,9 +64,8 @@ rh_status_q() {
   4  start()
   5  {
   6         if ! rh_status_q; then
   7 -               echo -n "Starting $DAEMON: "
   8 +               msg_starting "$DAEMON"
   9                 $DAEMON $CLVMDOPTS || return $?
  10 -               echo
  11         fi
  12
  13         # Refresh local cache.
  14 @@ -86,7 +85,7 @@ start()
  15
  16         ${lvm_vgscan} > /dev/null 2>&1
  17
  18 -       action "Activating VG(s):" ${lvm_vgchange} -ayl $LVM_VGS || return $?
  19 +       run_cmd "Activating VG(s):" ${lvm_vgchange} -ayl $LVM_VGS || return $?
  20
  21         touch $LOCK_FILE
  22
  23 @@ -111,27 +110,23 @@ stop()
  24
  25         [ -z "$LVM_VGS" ] && LVM_VGS="$(clustered_vgs)"
  26         if [ -n "$LVM_VGS" ]; then
  27 -               action "Deactivating clustered VG(s):" ${lvm_vgchange} -anl $LVM_VGS || return $?
  28 +               run_cmd "Deactivating clustered VG(s):" ${lvm_vgchange} -anl $LVM_VGS || return $?
  29         fi
  30
  31 -       action "Signaling $DAEMON to exit" kill -TERM $(pidofproc $DAEMON) || return $?
  32 +       run_cmd "Signaling $DAEMON to exit" kill -TERM $(pidofproc $DAEMON) || return $?
  33
  34         # wait half second before we start the waiting loop or we will show
  35         # the loop more time than really necessary
  36         usleep 500000
  37
  38         # clvmd could take some time to stop
  39 -       rh_status_q && action "Waiting for $DAEMON to exit:" wait_for_finish
  40 +       rh_status_q && run_cmd "Waiting for $DAEMON to exit:" wait_for_finish
  41
  42         if rh_status_q; then
  43 -               echo -n "$DAEMON failed to exit"
  44 -               failure
  45 -               echo
  46 +               fail
  47                 return 1
  48         else
  49 -               echo -n "$DAEMON terminated"
  50 -               success
  51 -               echo
  52 +               ok
  53         fi
  54
  55         rm -f $LOCK_FILE
  56 @@ -141,7 +136,7 @@ stop()
  57
  58  reload() {
  59         rh_status_q || exit 7
  60 -       action "Reloading $DAEMON configuration: " $DAEMON -R || return $?
  61 +       run_cmd "Reloading $DAEMON configuration: " $DAEMON -R || return $?
  62  }
  63
  64  restart() {
  65 @@ -152,7 +147,7 @@ restart() {
  66
  67         # Try to get clvmd to restart itself. This will preserve
  68         # exclusive LV locks
  69 -       action "Restarting $DAEMON: " $DAEMON -S
  70 +       run_cmd "Restarting $DAEMON: " $DAEMON -S
  71
  72         # If that fails then do a normal stop & restart
  73         if  [ $? != 0 ]; then