sanlock-init-pld.patch

   1 --- sanlock-2.5/init.d/sanlock.orig     2012-09-30 10:16:54.308331928 +0200
   2 +++ sanlock-2.5/init.d/sanlock  2012-09-30 10:51:21.691622171 +0200
   3 @@ -32,95 +32,86 @@
   4  [ -f /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
   5
   6  start() {
   7 -       [ -x $exec ] || exit 5
   8 -
   9 -       if [ ! -d /var/run/$prog ]; then
  10 -               install -d -o $SANLOCKUSER -g $SANLOCKUSER -m 775 /var/run/$prog
  11 -               [ -x /sbin/restorecon ] && restorecon /var/run/$prog
  12 +       # Check if the service is already running?
  13 +       if [ -f /var/lock/subsys/sanlock ]; then
  14 +               msg_already_running "sanlock"
  15 +               return
  16         fi
  17
  18 -       echo -n $"Starting $prog: "
  19 +       msg_starting "sanlock"
  20         daemon $prog daemon $SANLOCKOPTS
  21         retval=$?
  22 -       echo
  23         [ $retval -eq 0 ] && touch $lockfile
  24         return $retval
  25  }
  26
  27  stop() {
  28 +       if [ ! -f /var/lock/subsys/sanlock ]; then
  29 +               msg_not_running "sanlock"
  30 +               return
  31 +       fi
  32         PID=$(pidofproc -p $runfile $prog)
  33
  34 -       echo -n $"Sending stop signal $prog ($PID): "
  35         killproc -p $runfile $prog -TERM
  36         retval=$?
  37 -       echo
  38
  39         if [ $retval -ne 0 ]; then
  40                 return $retval
  41         fi
  42
  43 -       echo -n $"Waiting for $prog ($PID) to stop:"
  44 +       show "Waiting for %s (%s) to stop:" "$prog" "$PID"
  45 +       busy
  46
  47         timeout=10
  48         while checkpid $PID; do
  49                 sleep 1
  50                 timeout=$((timeout - 1))
  51                 if [ "$timeout" -le 0 ]; then
  52 -                       failure; echo
  53 -                       return 1
  54 +                       fail
  55 +                       retval=1
  56 +                       return $retval
  57                 fi
  58         done
  59
  60 -       success; echo
  61 +       ok
  62         rm -f $lockfile
  63         return $retval
  64  }
  65
  66 -restart() {
  67 -       rh_status_q && stop
  68 -       start
  69 -}
  70 -
  71 -reload() {
  72 -       restart
  73 -}
  74 -
  75 -rh_status() {
  76 -       status $prog
  77 -}
  78 -
  79 -rh_status_q() {
  80 -       rh_status >/dev/null 2>&1
  81 +condrestart() {
  82 +       if [ ! -f /var/lock/subsys/sanlock ]; then
  83 +               msg_not_running "sanlock"
  84 +               retval=$1
  85 +               return $retval
  86 +       fi
  87 +       stop && start
  88 +       retval=$?
  89 +       return $retval
  90  }
  91
  92  case "$1" in
  93         start)
  94 -               rh_status_q && exit 0
  95 -               $1
  96 +               start
  97                 ;;
  98         stop)
  99 -               rh_status_q || exit 0
 100 -               $1
 101 +               stop
 102                 ;;
 103         restart)
 104 -               $1
 105 +               stop
 106 +               start
 107                 ;;
 108 -       reload)
 109 -               rh_status_q || exit 7
 110 -               $1
 111 +       try-restart)
 112 +               condrestart 0
 113                 ;;
 114         force-reload)
 115 -               force_reload
 116 +               condrestart 7
 117                 ;;
 118         status)
 119 -               rh_status
 120 -               ;;
 121 -       condrestart|try-restart)
 122 -               rh_status_q || exit 0
 123 -               restart
 124 +               status --pidfile $runfile sanlock
 125 +               retval=$?
 126                 ;;
 127         *)
 128 -               echo $"Usage $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
 129 -               exit 2
 130 +               msg_usage "$0 {start|stop|status|restart||try-restart|force-reload}"
 131 +               exit 3
 132  esac
 133 -exit $?
 134 +exit $retval
 135 --- sanlock-2.5/init.d/wdmd.orig        2012-09-24 17:35:09.000000000 +0200
 136 +++ sanlock-2.5/init.d/wdmd     2012-09-30 10:51:00.684955942 +0200
 137 @@ -3,7 +3,7 @@
 138  # wdmd - watchdog multiplexing daemon
 139  #
 140  # chkconfig: 2345 97 03
 141 -# description: starts and stops sanlock daemon
 142 +# description: starts and stops wdmd daemon
 143  #
 144
 145
 146 @@ -33,105 +33,92 @@
 147
 148  watchdog_check() {
 149         if [ ! -c /dev/watchdog ]; then
 150 -               echo -n $"Loading the softdog kernel module: "
 151 +               show "Loading the softdog kernel module: "
 152                 modprobe softdog && udevadm settle
 153 -               [ -c /dev/watchdog ] && success || failure
 154 -               echo
 155 +               [ -c /dev/watchdog ] && ok || fail
 156         fi
 157  }
 158
 159  start() {
 160 +       # Check if the service is already running?
 161 +       if [ -f /var/lock/subsys/wdmd ]; then
 162 +               msg_already_running "wdmd"
 163 +               return
 164 +       fi
 165 +
 166         watchdog_check
 167
 168 -       [ -x $exec ] || exit 5
 169 -
 170 -       if [ ! -d /var/run/$prog ]; then
 171 -               install -d -g $WDMDGROUP -m 775 /var/run/$prog
 172 -               [ -x /sbin/restorecon ] && restorecon /var/run/$prog
 173 -       fi
 174 -
 175 -       echo -n $"Starting $prog: "
 176 +       msg_starting "wdmd"
 177         daemon $prog $WDMDOPTS
 178         retval=$?
 179 -       echo
 180         [ $retval -eq 0 ] && touch $lockfile
 181         return $retval
 182  }
 183
 184  stop() {
 185 +       if [ ! -f /var/lock/subsys/wdmd ]; then
 186 +               msg_not_running "wdmd"
 187 +               return
 188 +       fi
 189         PID=$(pidofproc -p $runfile $prog)
 190
 191 -       echo -n $"Sending stop signal $prog ($PID): "
 192         killproc -p $runfile $prog -TERM
 193         retval=$?
 194 -       echo
 195
 196         if [ $retval -ne 0 ]; then
 197                 return $retval
 198         fi
 199
 200 -       echo -n $"Waiting for $prog ($PID) to stop:"
 201 +       show "Waiting for %s (%s) to stop:" "$prog" "$PID"
 202
 203         timeout=10
 204         while checkpid $PID; do
 205                 sleep 1
 206                 timeout=$((timeout - 1))
 207                 if [ "$timeout" -le 0 ]; then
 208 -                       failure; echo
 209 -                       return 1
 210 +                       fail
 211 +                       retval=1
 212 +                       return $retval
 213                 fi
 214         done
 215
 216 -       success; echo
 217 +       ok
 218         rm -f $lockfile
 219         return $retval
 220  }
 221
 222 -restart() {
 223 -       rh_status_q && stop
 224 -       start
 225 -}
 226 -
 227 -reload() {
 228 -       restart
 229 -}
 230 -
 231 -rh_status() {
 232 -       status $prog
 233 -}
 234 -
 235 -rh_status_q() {
 236 -       rh_status >/dev/null 2>&1
 237 +condrestart() {
 238 +       if [ ! -f /var/lock/subsys/wdmd ]; then
 239 +               msg_not_running "wdmd"
 240 +               retval=$1
 241 +               return
 242 +       fi
 243 +       stop
 244 +       start
 245  }
 246
 247  case "$1" in
 248         start)
 249 -               rh_status_q && exit 0
 250 -               $1
 251 +               start
 252                 ;;
 253         stop)
 254 -               rh_status_q || exit 0
 255 -               $1
 256 +               stop
 257                 ;;
 258         restart)
 259 -               $1
 260 -               ;;
 261 -       reload)
 262 -               rh_status_q || exit 7
 263 -               $1
 264 +               stop
 265 +               start
 266                 ;;
 267         force-reload)
 268 -               force_reload
 269 +               condrestart 7
 270                 ;;
 271 -       status)
 272 -               rh_status
 273 +       try-restart)
 274 +               condrestart 0
 275                 ;;
 276 -       condrestart|try-restart)
 277 -               rh_status_q || exit 0
 278 -               restart
 279 +       status)
 280 +               status --pidfile $runfile wdmd
 281                 ;;
 282         *)
 283 -               echo $"Usage $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
 284 +               msg_usage "$0 {start|stop|status|restart|try-restart|force-reload}"
 285                 exit 2
 286  esac
 287 -exit $?
 288 +exit $retval