From 565402832bd415bc0ca10aa0750379718973fc2e Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 22 Apr 2016 21:07:58 +0800 Subject: [PATCH] debian: install systemd target files * enable it using dh_systemd_enable * start the target using dh_systemd_start * move the dh_installinit, dh_systemd_enable, dh_systemd_start calls down, so they can identify the service files if they care about them. Fixes: http://tracker.ceph.com/issues/15573 Signed-off-by: Kefu Chai (cherry picked from commit f950a0a7f5b35e13668379bc69dcb5d98a2dfc1f) --- debian/rules | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 73be439e4dc65..14e940721b3e3 100755 --- a/debian/rules +++ b/debian/rules @@ -117,8 +117,7 @@ binary-arch: build install dh_install -a --sourcedir=$(DESTDIR) --list-missing install -d -m0755 debian/ceph-base/etc/logrotate.d install -m0644 debian/ceph.logrotate debian/ceph-base/etc/logrotate.d - dh_installinit -p ceph-base --name ceph --no-start - dh_installinit -p radosgw --no-start + # dh_installinit is only set up to handle one upstart script # per package, so do this ourselves install -d -m0755 debian/ceph-base/etc/init @@ -156,18 +155,28 @@ binary-arch: build install 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 sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-osd/lib/systemd/system/ceph-disk@.service + install -m0644 systemd/ceph-mon.target debian/ceph-mon/lib/systemd/system + install -m0644 systemd/ceph-osd.target debian/ceph-osd/lib/systemd/system install -d -m0755 debian/ceph-mds/lib/systemd/system install -m0644 systemd/ceph-mds@.service debian/ceph-mds/lib/systemd/system sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-mds/lib/systemd/system/ceph-mds@.service + install -m0644 systemd/ceph-mds.target debian/ceph-mds/lib/systemd/system install -d -m0755 debian/radosgw/lib/systemd/system install -m0644 systemd/ceph-radosgw@.service debian/radosgw/lib/systemd/system sed -i s./etc/sysconfig/./etc/default/.g debian/radosgw/lib/systemd/system/ceph-radosgw@.service + install -m0644 systemd/ceph-radosgw.target debian/radosgw/lib/systemd/system install -d -m0755 debian/rbd-mirror/lib/systemd/system install -m0644 systemd/ceph-rbd-mirror@.service debian/rbd-mirror/lib/systemd/system sed -i s./etc/sysconfig/./etc/default/.g debian/rbd-mirror/lib/systemd/system/ceph-rbd-mirror@.service + install -m0644 systemd/ceph-rbd-mirror.target debian/rbd-mirror/lib/systemd/system + + dh_systemd_enable + dh_installinit -p ceph-base --name ceph --no-start + dh_installinit -p radosgw --no-start + dh_systemd_start --no-restart-on-upgrade dh_installman -a dh_lintian -a