From 27903e2c0f15a5b8b4c9ff9cc0229fe0936ad2ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Tue, 6 Jun 2017 12:21:07 +0200 Subject: [PATCH] ceph-common: fix logrotate on upgrade from Debian package --- ...fix-logrotate-on-upgrade-from-Debian.patch | 56 +++++++++++++++++++ patches/series | 1 + 2 files changed, 57 insertions(+) create mode 100644 patches/0007-ceph-common-fix-logrotate-on-upgrade-from-Debian.patch diff --git a/patches/0007-ceph-common-fix-logrotate-on-upgrade-from-Debian.patch b/patches/0007-ceph-common-fix-logrotate-on-upgrade-from-Debian.patch new file mode 100644 index 000000000..a49d394b0 --- /dev/null +++ b/patches/0007-ceph-common-fix-logrotate-on-upgrade-from-Debian.patch @@ -0,0 +1,56 @@ +From da20a6c3188f37b1f3fe30c651a90fc17e46b148 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= +Date: Tue, 6 Jun 2017 12:20:06 +0200 +Subject: [PATCH 7/7] ceph-common: fix logrotate on upgrade from Debian +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Fabian Grünbichler +--- + debian/ceph-common.postinst | 2 ++ + debian/ceph-common.postrm | 2 ++ + debian/ceph-common.preinst | 5 +++++ + 3 files changed, 9 insertions(+) + create mode 100755 debian/ceph-common.preinst + +diff --git a/debian/ceph-common.postinst b/debian/ceph-common.postinst +index 719dc79..a431b9a 100644 +--- a/debian/ceph-common.postinst ++++ b/debian/ceph-common.postinst +@@ -99,6 +99,8 @@ case "$1" in + ;; + esac + ++dpkg-maintscript-helper rm_conffile /etc/logrotate.d/ceph-common -- "$@" ++ + # dh_installdeb will replace this with shell code automatically + # generated by other debhelper scripts. + +diff --git a/debian/ceph-common.postrm b/debian/ceph-common.postrm +index b621854..63cfe4f 100644 +--- a/debian/ceph-common.postrm ++++ b/debian/ceph-common.postrm +@@ -37,6 +37,8 @@ case "$1" in + ;; + esac + ++dpkg-maintscript-helper rm_conffile /etc/logrotate.d/ceph-common -- "$@" ++ + # dh_installdeb will replace this with shell code automatically + # generated by other debhelper scripts. + +diff --git a/debian/ceph-common.preinst b/debian/ceph-common.preinst +new file mode 100755 +index 0000000..3bc000e +--- /dev/null ++++ b/debian/ceph-common.preinst +@@ -0,0 +1,5 @@ ++#!/bin/sh ++ ++set -e ++ ++dpkg-maintscript-helper rm_conffile /etc/logrotate.d/ceph-common -- "$@" +-- +2.1.4 + diff --git a/patches/series b/patches/series index 7da8d69c6..e98bac707 100644 --- a/patches/series +++ b/patches/series @@ -4,3 +4,4 @@ 0004-enable-systemd-targets-by-default.patch 0005-ceph-mgr-fix-package-description.patch 0006-ceph-mgr-don-t-load-broken-rest-module-by-default.patch +0007-ceph-common-fix-logrotate-on-upgrade-from-Debian.patch -- 2.39.2