From: Jason Dillaman Date: Tue, 14 Jul 2020 15:16:59 +0000 (-0400) Subject: rbd-nbd: quisce hook should be installed to /usr/libexec/... X-Git-Tag: v16.1.0~1712^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F36099%2Fhead;p=ceph.git rbd-nbd: quisce hook should be installed to /usr/libexec/... The rbd-nbd daemon expects the rbd-nbd_quiesce script to be installed in the libexec directory on all distros. Signed-off-by: Jason Dillaman --- diff --git a/debian/rbd-nbd.install b/debian/rbd-nbd.install index c3768b9d24ef..27c529ad58e7 100644 --- a/debian/rbd-nbd.install +++ b/debian/rbd-nbd.install @@ -1,3 +1,3 @@ usr/bin/rbd-nbd usr/share/man/man8/rbd-nbd.8 -usr/lib/rbd-nbd/rbd-nbd_quiesce +usr/libexec/rbd-nbd/rbd-nbd_quiesce diff --git a/debian/rules b/debian/rules index e89432a9dc82..b591ce7d0e0c 100755 --- a/debian/rules +++ b/debian/rules @@ -63,7 +63,7 @@ override_dh_auto_install: install -D -m 644 etc/sysctl/90-ceph-osd.conf $(DESTDIR)/etc/sysctl.d/30-ceph-osd.conf install -D -m 600 sudoers.d/ceph-osd-smartctl $(DESTDIR)/etc/sudoers.d/ceph-osd-smartctl install -D -m 600 sudoers.d/cephadm $(DESTDIR)/etc/sudoers.d/cephadm - install -D -m 755 src/tools/rbd_nbd/rbd-nbd_quiesce $(DESTDIR)/usr/lib/rbd-nbd/rbd-nbd_quiesce + install -D -m 755 src/tools/rbd_nbd/rbd-nbd_quiesce $(DESTDIR)/usr/libexec/rbd-nbd/rbd-nbd_quiesce install -m 755 src/cephadm/cephadm $(DESTDIR)/usr/sbin/cephadm