debian/patches/fix-gfs-init.d-scripts.patch

   1 Index: new/gfs2/init.d/gfs2-cluster
   2 ===================================================================
   3 --- new.orig/gfs2/init.d/gfs2-cluster   2012-02-17 09:01:54.000000000 +0100
   4 +++ new/gfs2/init.d/gfs2-cluster        2012-02-17 10:09:57.000000000 +0100
   5 @@ -19,27 +19,28 @@
   6  # Description: Starts and stops gfs_controld for dlm based GFS2 filesystems
   7  ### END INIT INFO
   8
   9 -. /etc/rc.d/init.d/functions
  10 +. /lib/lsb/init-functions
  11
  12  prog="gfs_controld"
  13 -lockfile="/var/lock/subsys/$prog"
  14 +lockfile="/var/lock/$prog"
  15  exec="/usr/sbin/$prog"
  16 +DESC="GFS2 Control Daemon"
  17
  18  start() {
  19         [ -x $exec ] || exit 5
  20 -       echo -n $"Starting $prog: "
  21 -       daemon $prog
  22 +       log_daemon_msg "Starting $DESC" "$prog"
  23 +       start_daemon $exec
  24         retval=$?
  25 -       echo
  26 +       log_end_msg $retval
  27         [ $retval -eq 0 ] && touch $lockfile
  28         return $retval
  29  }
  30
  31  stop() {
  32 -       echo -n $"Stopping $prog: "
  33 +       log_daemon_msg "Stopping $DESC" "$prog"
  34         killproc $prog
  35         retval=$?
  36 -       echo
  37 +       log_end_msg $retval
  38         [ $retval -eq 0 ] && rm -f $lockfile
  39  }
  40
  41 @@ -53,7 +54,7 @@
  42  }
  43
  44  rh_status() {
  45 -       status $prog
  46 +        status_of_proc $exec $prog
  47  }
  48
  49  rh_status_q() {
  50 @@ -87,7 +88,7 @@
  51                 restart
  52                 ;;
  53         *)
  54 -               echo $"Usage $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
  55 +               echo "Usage $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
  56                 exit 2
  57  esac
  58  exit $?