debian/patches/fix-rgmanager-init.diff

   1 Index: new/rgmanager/init.d/rgmanager.in
   2 ===================================================================
   3 --- new.orig/rgmanager/init.d/rgmanager.in      2013-03-15 07:21:53.000000000 +0100
   4 +++ new/rgmanager/init.d/rgmanager.in   2013-03-25 06:11:35.000000000 +0100
   5 @@ -6,10 +6,10 @@
   6  #
   7  ### BEGIN INIT INFO
   8  # Provides:            rgmanager
   9 -# Required-Start:      cman cpglockd
  10 -# Required-Stop:       cman cpglockd
  11 -# Default-Start:
  12 -# Default-Stop:
  13 +# Required-Start:      $remote_fs cman +vz +qemu-server
  14 +# Required-Stop:       $remote_fs cman +vz +qemu-server
  15 +# Default-Start:        2 3 4 5
  16 +# Default-Stop:         0 1 6
  17  # Short-Description:   Starts and stops Red Hat Service (resource group) Manager
  18  # Description:         Starts and stops Red Hat Service (resource group) Manager
  19  ### END INIT INFO
  20 @@ -20,6 +20,10 @@
  21  # set secure PATH
  22  PATH="/sbin:/bin:/usr/sbin:/usr/bin:@SBINDIR@"
  23
  24 +CCFG="/etc/cluster/cluster.conf"
  25 +
  26 +test -f "$CCFG" || exit 0
  27 +
  28  success()
  29  {
  30         echo -ne "[  OK  ]\r"
  31 @@ -52,8 +56,7 @@
  32
  33  # deb based distros
  34  if [ -d /etc/default ]; then
  35 -       [ -f /etc/default/cluster ] && . /etc/default/cluster
  36 -       [ -f /etc/default/rgmanager ] && . /etc/default/rgmanager
  37 +       [ -f /etc/default/redhat-cluster-pve ] && . /etc/default/redhat-cluster-pve
  38         [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/rgmanager"
  39  fi
  40
  41 @@ -82,6 +85,11 @@
  42                 while ! cpglockdump > /dev/null 2>&1; do sleep 1; done
  43  }
  44
  45 +rgmanager_enabled()
  46 +{
  47 +       ccs_tool query /cluster/rm >/dev/null 2>&1
  48 +}
  49 +
  50  rtrn=0
  51
  52  if [ "$EUID" != "0" ]; then
  53 @@ -91,6 +99,11 @@
  54
  55  case "$1" in
  56  start)
  57 +
  58 +       if ! rgmanager_enabled; then
  59 +           exit 0;
  60 +       fi
  61 +
  62         echo -n "Starting $ID: "
  63
  64         # most recent distributions use tmpfs for /var/run
  65 @@ -107,7 +120,9 @@
  66         if status $RGMGRD > /dev/null 2>&1; then
  67                 success
  68         else
  69 -               if $RGMGRD $RGMGR_OPTS; then
  70 +               # do not trust return code
  71 +               $RGMGRD $RGMGR_OPTS;
  72 +               if status $RGMGRD > /dev/null 2>&1; then
  73                         touch $LOCK_FILE
  74                         success
  75                 else
  76 @@ -141,11 +156,12 @@
  77         echo -n "Stopping $ID: "
  78
  79         if status $RGMGRD > /dev/null 2>&1; then
  80 -               if stop_cluster; then
  81 -                       success
  82 -               else
  83 -                       failure
  84 +               stop_cluster
  85 +               if status $RGMGRD > /dev/null 2>&1; then
  86 +                       failure
  87                         rtrn=1
  88 +               else
  89 +                       success
  90                 fi
  91         else
  92                 success