On 7/1/19 4:43 PM, Dominik Csapak wrote: > Signed-off-by: Dominik Csapak <d.csa...@proxmox.com> > --- > changes from v1: > * use the checksum of the service file to be sure that it is our > service we are disabling/deleting > ...e-ceph-osd-activation-script-in-post.patch | 41 +++++++++++++++++++ > patches/series | 1 + > 2 files changed, 42 insertions(+) > create mode 100644 > patches/0009-remove-legacy-pve-ceph-osd-activation-script-in-post.patch > > diff --git > a/patches/0009-remove-legacy-pve-ceph-osd-activation-script-in-post.patch > b/patches/0009-remove-legacy-pve-ceph-osd-activation-script-in-post.patch > new file mode 100644 > index 000000000..33af5fe87 > --- /dev/null > +++ b/patches/0009-remove-legacy-pve-ceph-osd-activation-script-in-post.patch > @@ -0,0 +1,41 @@ > +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 > +From: Dominik Csapak <d.csa...@proxmox.com> > +Date: Thu, 27 Jun 2019 14:37:06 +0200 > +Subject: [PATCH 09/10] remove legacy pve ceph osd activation script in > + postinst of ceph-osd > + > +that service was distributed by pve-manager (but not in a regular way) > +and only executed ceph-disk activate-all > + > +this fails on nautilus and has to be removed when upgrading from > +luminous > + > +Signed-off-by: Dominik Csapak <d.csa...@proxmox.com> > +--- > + debian/ceph-osd.postinst | 13 +++++++++++++ > + 1 file changed, 13 insertions(+) > + > +diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst > +index 5e44548fe8..7cc1f6ce14 100644 > +--- a/debian/ceph-osd.postinst > ++++ b/debian/ceph-osd.postinst > +@@ -25,6 +25,19 @@ case "$1" in > + configure) > + [ -x /etc/init.d/procps ] && invoke-rc.d procps restart || : > + [ -x /sbin/start ] && start ceph-osd-all || : > ++ > ++ # remove legacy osd activation service > ++ if [ ! -z "$2" ] && dpkg --compare-versions "$2" lt '14'; then
applied, with a followup changing above to '14.2.1-pve2', thanks! > ++ CEPHSERVICE="/etc/systemd/system/ceph.service" > ++ MD5SUM="f716952fcc5dda4ecdb153c02627da52 $CEPHSERVICE" > ++ if [ -e "$CEPHSERVICE" ] && [ "$(md5sum $CEPHSERVICE)" = "$MD5SUM" > ]; then > ++ if [ -e > /etc/systemd/system/multi-user.target.wants/ceph.service ]; then > ++ deb-systemd-invoke disable ceph.service >/dev/null || : > ++ fi > ++ rm "$CEPHSERVICE" || : > ++ systemctl --system daemon-reload >/dev/null || : > ++ fi > ++ fi > + ;; > + abort-upgrade|abort-remove|abort-deconfigure) > + : > diff --git a/patches/series b/patches/series > index de9726160..0f31ac863 100644 > --- a/patches/series > +++ b/patches/series > @@ -3,3 +3,4 @@ > 0006-debian-control-add-break-libpvestorage-perl.patch > 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 > _______________________________________________ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
