From: Ken Dreyer Date: Tue, 16 Feb 2016 19:56:34 +0000 (-0700) Subject: debian: replace SysV rbdmap with systemd service X-Git-Tag: v10.2.8~89^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14383%2Fhead;p=ceph.git debian: replace SysV rbdmap with systemd service Stop shipping /etc/init.d/rbdmap in the Debian packages. Ship the rbdmap.service systemd unit file instead. The corresponding change has already been made for RPMs, in 9224ac2ad25f7d017916f58b642c0ea25305c3e5. For Upstart-based systems (eg Ubuntu Trusty), the Debian packages already contain rbdmap.conf. (This gets us a tiny bit closer to being able to remove the rbdmap SysV script from our tree entirely.) Signed-off-by: Ken Dreyer (cherry picked from commit 839807118dda2fb4d57ed9d50ec46e3ee0e2820a) Conflicts: debian/ceph-common.install (retain /etc/init.d/rbdmap so jewel users can choose sysvinit or systemd) debian/rules (retain /etc/init.d/rbdmap so jewel users can choose sysvinit or systemd) --- diff --git a/debian/rules b/debian/rules index 14aab2edcafe..cd73c8789688 100755 --- a/debian/rules +++ b/debian/rules @@ -151,6 +151,7 @@ binary-arch: build install install -m0644 systemd/ceph-create-keys@.service debian/ceph-base/lib/systemd/system install -m0644 systemd/ceph-osd@.service debian/ceph-osd/lib/systemd/system install -m0644 systemd/ceph-disk@.service debian/ceph-osd/lib/systemd/system + install -m0644 systemd/rbdmap.service debian/ceph-common/lib/systemd/system sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-mon/lib/systemd/system/ceph-mon@.service sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-base/lib/systemd/system/ceph-create-keys@.service sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-osd/lib/systemd/system/ceph-osd@.service