From: Laurent Barbe <laurent@ksperis.com>
Date: Tue, 2 Jul 2013 14:53:11 +0000 (+0200)
Subject: Move rbdmap file to /etc/ceph
X-Git-Tag: v0.67-rc1~162^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F390%2Fhead;p=ceph.git

Move rbdmap file to /etc/ceph

Signed-off-by: Laurent Barbe <laurent@ksperis.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 0cab8124ac36..1d2301ae89b1 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -284,7 +284,7 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
 install -D src/init-radosgw.sysv $RPM_BUILD_ROOT%{_initrddir}/ceph-radosgw
 install -D src/init-rbd $RPM_BUILD_ROOT%{_initrddir}/rbdmap
-install -D src/rbdmap $RPM_BUILD_ROOT%{_sysconfdir}/rbdmap
+install -D src/rbdmap $RPM_BUILD_ROOT%{_sysconfdir}/ceph/rbdmap
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 ln -sf ../../etc/init.d/ceph %{buildroot}/%{_sbindir}/rcceph
 ln -sf ../../etc/init.d/ceph-radosgw %{buildroot}/%{_sbindir}/rcceph-radosgw
@@ -408,7 +408,7 @@ fi
 %config %{_sysconfdir}/bash_completion.d/radosgw-admin
 %config %{_sysconfdir}/bash_completion.d/rbd
 %{_initrddir}/rbdmap
-%config(noreplace) %{_sysconfdir}/rbdmap
+%config(noreplace) %{_sysconfdir}/ceph/rbdmap
 %config(noreplace) %{_sysconfdir}/logrotate.d/ceph
 %config(noreplace) %{_sysconfdir}/logrotate.d/radosgw
 %{_mandir}/man8/ceph-mon.8*
diff --git a/debian/ceph.install b/debian/ceph.install
index f29450f41639..25e5c1d709eb 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -28,5 +28,5 @@ usr/share/man/man8/crushtool.8
 usr/share/man/man8/mkcephfs.8
 usr/share/man/man8/monmaptool.8
 usr/share/man/man8/osdmaptool.8
-etc/rbdmap
+etc/ceph/rbdmap
 etc/init.d/rbdmap
diff --git a/debian/rules b/debian/rules
index b6e2622b5625..c32c3e280b38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,7 @@ install: build
 	install -D -m 644 udev/50-rbd.rules $(DESTDIR)/lib/udev/rules.d/50-rbd.rules
 	install -D -m 644 udev/60-ceph-partuuid-workaround.rules $(DESTDIR)/lib/udev/rules.d/60-ceph-partuuid-workaround.rules
 	install -D -m 644 udev/95-ceph-osd.rules $(DESTDIR)/lib/udev/rules.d/95-ceph-osd.rules
-	install -D -m 644 src/rbdmap $(DESTDIR)/etc/rbdmap
+	install -D -m 644 src/rbdmap $(DESTDIR)/etc/ceph/rbdmap
 	install -D -m 755 src/init-rbdmap $(DESTDIR)/etc/init.d/rbdmap
 
 # Add here commands to install the package into debian/testpack.
diff --git a/src/init-rbdmap b/src/init-rbdmap
index 31c90da416c3..6ea4af7624b5 100755
--- a/src/init-rbdmap
+++ b/src/init-rbdmap
@@ -11,7 +11,7 @@
 ### END INIT INFO
 
 DESC="RBD Mapping"
-RBDMAPFILE="/etc/rbdmap"
+RBDMAPFILE="/etc/ceph/rbdmap"
 
 . /lib/lsb/init-functions