From: Sage Weil <sage@newdream.net>
Date: Sat, 20 Feb 2010 05:19:09 +0000 (-0800)
Subject: debian: mount.ceph in /sbin, not /usr/sbin
X-Git-Tag: v0.20~422
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=74ac2904cb0a693e46eb15c7499f06d41d40c391;p=ceph.git

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

diff --git a/debian/ceph.dirs b/debian/ceph.dirs
index aa72f8ab39cc..57ad5d6b738e 100644
--- 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 ad8d1fb4939d..230c9e2d0e47 100644
--- 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 389cecc2c5c8..520f4e72fd64 100644
--- 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