patches/0007-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 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  15 ---
  16  debian/ceph-base.prerm | 17 -----------------
  17  debian/ceph-mds.prerm  | 17 -----------------
  18  debian/ceph-mgr.prerm  | 17 -----------------
  19  debian/ceph-mon.prerm  | 17 -----------------
  20  debian/ceph-osd.prerm  | 17 -----------------
  21  5 files changed, 85 deletions(-)
  22
  23 diff --git a/debian/ceph-base.prerm b/debian/ceph-base.prerm
  24 index bfd7d3d6f..37460790a 100644
  25 --- a/debian/ceph-base.prerm
  26 +++ b/debian/ceph-base.prerm
  27 @@ -1,23 +1,6 @@
  28  #!/bin/sh
  29  # vim: set noet ts=8:
  30
  31 -set -e
  32 -
  33 -case "$1" in
  34 -    remove)
  35 -       [ -x /sbin/stop ] && stop ceph-all || true
  36 -       invoke-rc.d ceph stop || {
  37 -           RESULT=$?
  38 -           if [ $RESULT != 100 ]; then
  39 -               exit $RESULT
  40 -           fi
  41 -       }
  42 -       ;;
  43 -
  44 -    *)
  45 -       ;;
  46 -esac
  47 -
  48  #DEBHELPER#
  49
  50  exit 0
  51 diff --git a/debian/ceph-mds.prerm b/debian/ceph-mds.prerm
  52 index 654518a7d..37460790a 100644
  53 --- a/debian/ceph-mds.prerm
  54 +++ b/debian/ceph-mds.prerm
  55 @@ -1,23 +1,6 @@
  56  #!/bin/sh
  57  # vim: set noet ts=8:
  58
  59 -set -e
  60 -
  61 -case "$1" in
  62 -    remove)
  63 -       [ -x /sbin/stop ] && stop ceph-mds-all || :
  64 -       invoke-rc.d ceph stop mds || {
  65 -           RESULT=$?
  66 -           if [ $RESULT != 100 ]; then
  67 -               exit $RESULT
  68 -           fi
  69 -       }
  70 -       ;;
  71 -
  72 -    *)
  73 -       ;;
  74 -esac
  75 -
  76  #DEBHELPER#
  77
  78  exit 0
  79 diff --git a/debian/ceph-mgr.prerm b/debian/ceph-mgr.prerm
  80 index 6fb7b245a..37460790a 100644
  81 --- a/debian/ceph-mgr.prerm
  82 +++ b/debian/ceph-mgr.prerm
  83 @@ -1,23 +1,6 @@
  84  #!/bin/sh
  85  # vim: set noet ts=8:
  86
  87 -set -e
  88 -
  89 -case "$1" in
  90 -    remove)
  91 -       [ -x /sbin/stop ] && stop ceph-mgr-all || :
  92 -       invoke-rc.d ceph stop mgr || {
  93 -           RESULT=$?
  94 -           if [ $RESULT != 100 ]; then
  95 -               exit $RESULT
  96 -           fi
  97 -       }
  98 -       ;;
  99 -
 100 -    *)
 101 -       ;;
 102 -esac
 103 -
 104  #DEBHELPER#
 105
 106  exit 0
 107 diff --git a/debian/ceph-mon.prerm b/debian/ceph-mon.prerm
 108 index 5f64058a5..37460790a 100644
 109 --- a/debian/ceph-mon.prerm
 110 +++ b/debian/ceph-mon.prerm
 111 @@ -1,23 +1,6 @@
 112  #!/bin/sh
 113  # vim: set noet ts=8:
 114
 115 -set -e
 116 -
 117 -case "$1" in
 118 -    remove)
 119 -       [ -x /sbin/stop ] && stop ceph-mon-all || true
 120 -       invoke-rc.d ceph stop mon || {
 121 -           RESULT=$?
 122 -           if [ $RESULT != 100 ]; then
 123 -               exit $RESULT
 124 -           fi
 125 -       }
 126 -       ;;
 127 -
 128 -    *)
 129 -       ;;
 130 -esac
 131 -
 132  #DEBHELPER#
 133
 134  exit 0
 135 diff --git a/debian/ceph-osd.prerm b/debian/ceph-osd.prerm
 136 index 40f07b621..37460790a 100644
 137 --- a/debian/ceph-osd.prerm
 138 +++ b/debian/ceph-osd.prerm
 139 @@ -1,23 +1,6 @@
 140  #!/bin/sh
 141  # vim: set noet ts=8:
 142
 143 -set -e
 144 -
 145 -case "$1" in
 146 -    remove)
 147 -       [ -x /sbin/stop ] && stop ceph-osd-all || true
 148 -       invoke-rc.d ceph stop osd || {
 149 -           RESULT=$?
 150 -           if [ $RESULT != 100 ]; then
 151 -               exit $RESULT
 152 -           fi
 153 -       }
 154 -       ;;
 155 -
 156 -    *)
 157 -       ;;
 158 -esac
 159 -
 160  #DEBHELPER#
 161
 162  exit 0