debian: mount.ceph in /sbin, not /usr/sbin

diff --git a/debian/ceph.dirs b/debian/ceph.dirs
index aa72f8ab39cc347ce2bf258a5dd25fbd223c53a8..57ad5d6b738ec42c2cf8fdb96a2b4b1b2874544d 100644 (file)
--- a/debian/ceph.dirs
+++ b/debian/ceph.dirs
@@ -1,5 +1,7 @@
+sbin
 usr/bin
-var/log/ceph
-var/log/ceph/stat
+usr/sbin
 etc/ceph
 usr/share/doc/ceph
+var/log/ceph
+var/log/ceph/stat

diff --git a/debian/ceph.install b/debian/ceph.install
index ad8d1fb4939d0c0e9294d77d7e1c6cbc6e5151cc..230c9e2d0e47519d4fb7d20c51599593ae921a6c 100644 (file)
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -11,7 +11,7 @@ usr/bin/cosd
 usr/bin/mkmonfs
 usr/bin/cauthtool
 usr/bin/rados
-usr/sbin/mount.ceph
+sbin/mount.ceph
 usr/sbin/mkcephfs
 usr/lib/ceph/ceph_common.sh
 etc/ceph/sample.ceph.conf

diff --git a/src/Makefile.am b/src/Makefile.am
index 389cecc2c5c87ebcfaa31bf790bdb5230c368da9..520f4e72fd64c329adc5cd39e9a11e7df1e9d9d8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,7 +44,7 @@ osdmaptool_LDADD = libcrush.a libcommon.a -lpthread -lm -lcrypto
 bin_PROGRAMS += monmaptool crushtool osdmaptool
 
 mount_ceph_SOURCES = mount/mount.ceph.c
-sbin_PROGRAMS += mount.ceph
+noinst_PROGRAMS = mount.ceph
 
 
 core: cmon cosd cmds mkmonfs ceph cconf monmaptool osdmaptool crushtool
@@ -260,6 +260,8 @@ EXTRA_DIST = verify-mds-journal.sh vstart.sh stop.sh \
             crun ceph_common.sh init-ceph.in mkcephfs.in make_version
 
 install-data-local:
+       mkdir -p $(DESTDIR)/sbin
+       $(install_sh_SCRIPT) -m 0755 mount.ceph $(DESTDIR)/sbin/mount.ceph
        mkdir -p $(DESTDIR)$(sbindir)/ceph
        $(install_sh_SCRIPT) -m 0755 mkcephfs $(DESTDIR)$(sbindir)/mkcephfs
        mkdir -p $(DESTDIR)$(libdir)/ceph