patches/0012-Remove-failing-actions-from-prerm.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Dominic=20J=C3=A4ger?= <d.jaeger@proxmox.com>
   3 Date: Mon, 3 Feb 2020 11:57:22 +0100
   4 Subject: [PATCH] Remove failing actions from prerm
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 The first part of the script fails (/sbin/stop doesn't exist and invoke-rc.d
  10 fails) and doesn't let us continue to #DEBHELPER#. #DEBHELPER#, however, gets
  11 replaced by a systemd call that successfully stops the ceph services.
  12
  13 Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
  14 ---
  15  debian/ceph-base.prerm | 17 -----------------
  16  debian/ceph-mds.prerm  | 17 -----------------
  17  debian/ceph-mgr.prerm  | 17 -----------------
  18  debian/ceph-mon.prerm  | 17 -----------------
  19  debian/ceph-osd.prerm  | 17 -----------------
  20  5 files changed, 85 deletions(-)
  21
  22 diff --git a/debian/ceph-base.prerm b/debian/ceph-base.prerm
  23 index bfd7d3d6f..37460790a 100644
  24 --- a/debian/ceph-base.prerm
  25 +++ b/debian/ceph-base.prerm
  26 @@ -1,23 +1,6 @@
  27  #!/bin/sh
  28  # vim: set noet ts=8:
  29
  30 -set -e
  31 -
  32 -case "$1" in
  33 -    remove)
  34 -       [ -x /sbin/stop ] && stop ceph-all || true
  35 -       invoke-rc.d ceph stop || {
  36 -           RESULT=$?
  37 -           if [ $RESULT != 100 ]; then
  38 -               exit $RESULT
  39 -           fi
  40 -       }
  41 -       ;;
  42 -
  43 -    *)
  44 -       ;;
  45 -esac
  46 -
  47  #DEBHELPER#
  48
  49  exit 0
  50 diff --git a/debian/ceph-mds.prerm b/debian/ceph-mds.prerm
  51 index 654518a7d..37460790a 100644
  52 --- a/debian/ceph-mds.prerm
  53 +++ b/debian/ceph-mds.prerm
  54 @@ -1,23 +1,6 @@
  55  #!/bin/sh
  56  # vim: set noet ts=8:
  57
  58 -set -e
  59 -
  60 -case "$1" in
  61 -    remove)
  62 -       [ -x /sbin/stop ] && stop ceph-mds-all || :
  63 -       invoke-rc.d ceph stop mds || {
  64 -           RESULT=$?
  65 -           if [ $RESULT != 100 ]; then
  66 -               exit $RESULT
  67 -           fi
  68 -       }
  69 -       ;;
  70 -
  71 -    *)
  72 -       ;;
  73 -esac
  74 -
  75  #DEBHELPER#
  76
  77  exit 0
  78 diff --git a/debian/ceph-mgr.prerm b/debian/ceph-mgr.prerm
  79 index 6fb7b245a..37460790a 100644
  80 --- a/debian/ceph-mgr.prerm
  81 +++ b/debian/ceph-mgr.prerm
  82 @@ -1,23 +1,6 @@
  83  #!/bin/sh
  84  # vim: set noet ts=8:
  85
  86 -set -e
  87 -
  88 -case "$1" in
  89 -    remove)
  90 -       [ -x /sbin/stop ] && stop ceph-mgr-all || :
  91 -       invoke-rc.d ceph stop mgr || {
  92 -           RESULT=$?
  93 -           if [ $RESULT != 100 ]; then
  94 -               exit $RESULT
  95 -           fi
  96 -       }
  97 -       ;;
  98 -
  99 -    *)
 100 -       ;;
 101 -esac
 102 -
 103  #DEBHELPER#
 104
 105  exit 0
 106 diff --git a/debian/ceph-mon.prerm b/debian/ceph-mon.prerm
 107 index 5f64058a5..37460790a 100644
 108 --- a/debian/ceph-mon.prerm
 109 +++ b/debian/ceph-mon.prerm
 110 @@ -1,23 +1,6 @@
 111  #!/bin/sh
 112  # vim: set noet ts=8:
 113
 114 -set -e
 115 -
 116 -case "$1" in
 117 -    remove)
 118 -       [ -x /sbin/stop ] && stop ceph-mon-all || true
 119 -       invoke-rc.d ceph stop mon || {
 120 -           RESULT=$?
 121 -           if [ $RESULT != 100 ]; then
 122 -               exit $RESULT
 123 -           fi
 124 -       }
 125 -       ;;
 126 -
 127 -    *)
 128 -       ;;
 129 -esac
 130 -
 131  #DEBHELPER#
 132
 133  exit 0
 134 diff --git a/debian/ceph-osd.prerm b/debian/ceph-osd.prerm
 135 index 40f07b621..37460790a 100644
 136 --- a/debian/ceph-osd.prerm
 137 +++ b/debian/ceph-osd.prerm
 138 @@ -1,23 +1,6 @@
 139  #!/bin/sh
 140  # vim: set noet ts=8:
 141
 142 -set -e
 143 -
 144 -case "$1" in
 145 -    remove)
 146 -       [ -x /sbin/stop ] && stop ceph-osd-all || true
 147 -       invoke-rc.d ceph stop osd || {
 148 -           RESULT=$?
 149 -           if [ $RESULT != 100 ]; then
 150 -               exit $RESULT
 151 -           fi
 152 -       }
 153 -       ;;
 154 -
 155 -    *)
 156 -       ;;
 157 -esac
 158 -
 159  #DEBHELPER#
 160
 161  exit 0
 162 --
 163 2.20.1
 164