[pve-devel] applied: [PATCH ceph v2 2/2] add patch to remove init.d ceph script

[Thomas Lamprecht]

On 7/1/19 4:43 PM, Dominik Csapak wrote:
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
> new in v2
>  ...010-remove-legacy-init.d-ceph-script.patch | 28 +++++++++++++++++++
>  patches/series                                |  1 +
>  2 files changed, 29 insertions(+)
>  create mode 100644 patches/0010-remove-legacy-init.d-ceph-script.patch
> 
> diff --git a/patches/0010-remove-legacy-init.d-ceph-script.patch b/patches/0010-remove-legacy-init.d-ceph-script.patch
> new file mode 100644
> index 000000000..074bf2190
> --- /dev/null
> +++ b/patches/0010-remove-legacy-init.d-ceph-script.patch
> @@ -0,0 +1,28 @@
> +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
> +From: Dominik Csapak <d.csapak at proxmox.com>
> +Date: Fri, 28 Jun 2019 16:31:34 +0200
> +Subject: [PATCH 10/10] remove legacy init.d ceph script
> +
> +Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> +---
> + debian/ceph-base.install     | 1 -
> + debian/ceph-base.maintscript | 1 +
> + 2 files changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/debian/ceph-base.install b/debian/ceph-base.install
> +index 24731dc89d..7f7c56c4bc 100644
> +--- a/debian/ceph-base.install
> ++++ b/debian/ceph-base.install
> +@@ -1,4 +1,3 @@
> +-etc/init.d/ceph
> + lib/systemd/system/ceph-crash.service
> + usr/bin/ceph-crash
> + usr/bin/ceph-debugpack
> +diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript
> +index 196dc08413..180b7dfde4 100644
> +--- a/debian/ceph-base.maintscript
> ++++ b/debian/ceph-base.maintscript
> +@@ -1,2 +1,3 @@
> ++rm_conffile /etc/init.d/ceph 14.2.1-pve1 ceph-base
> + rm_conffile /etc/logrotate.d/ceph
> + rm_conffile /etc/logrotate.d/ceph.logrotate
> diff --git a/patches/series b/patches/series
> index 0f31ac863..91dfc6138 100644
> --- a/patches/series
> +++ b/patches/series
> @@ -4,3 +4,4 @@
>  0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch
>  0008-ceph-volume-lvm.zap-fix-cleanup-for-db-partitions.patch
>  0009-remove-legacy-pve-ceph-osd-activation-script-in-post.patch
> +0010-remove-legacy-init.d-ceph-script.patch
> 

applied, thanks!