sanlock-init-pld.patch

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