[Pkg-ceph-commits] [ceph] 04/23: Sync upstream changes around rbdmap install and conf files.

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch jewel
in repository ceph.

commit 438f3486e8984279d22b33aa81b4e34f9ad6a401
Author: James Page <james.page at ubuntu.com>
Date:   Mon Jan 25 15:17:43 2016 +0000

    Sync upstream changes around rbdmap install and conf files.
---
 debian/ceph-common.install | 3 ++-
 debian/rules               | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index c4b147d..d033c38 100644
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -1,6 +1,6 @@
 etc/bash_completion.d/rados
 etc/bash_completion.d/rbd
-src/rbdmap etc/ceph
+etc/ceph/rbdmap
 udev/50-rbd.rules /lib/udev/rules.d
 usr/bin/ceph
 usr/bin/ceph-authtool
@@ -12,6 +12,7 @@ usr/bin/ceph-rbdnamer
 usr/bin/ceph-syn
 usr/bin/rados
 usr/bin/rbd
+usr/bin/rbdmap
 usr/bin/rbd-replay*
 usr/lib/python*/dist-packages/ceph_argparse.py*
 usr/lib/python*/dist-packages/ceph_daemon.py*
diff --git a/debian/rules b/debian/rules
index 485299a..3ee366c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,6 +73,7 @@ override_dh_auto_install:
 	#       from the package install - package ships unversioned modules.
 	rm -f $(CURDIR)/debian/tmp/usr/lib/*/ceph/erasure-code/libec_*.so.*
 	find $(CURDIR)/debian/tmp/usr/lib/*/ceph/erasure-code -type l -delete || :
+	install -D -m 644 src/etc-rbdmap $(DESTDIR)/etc/ceph/rbdmap
 
 override_dh_installinit:
 	dh_installinit --no-start

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git