ceph.spec.in, init-ceph.in: Don't autostart ceph service on Fedora.

This patch is taken from the current Fedora package and makes the upstream
ceph.spec compliant with Fedora policy. The goal is to be fully compliant
upstream so that we can replace current Fedora package with upstream
package to fix many bugs in Fedora.

Addition from Dan Mick <dan.mick@inktank.com>:
Do this for RHEL and Centos as well, since they surely will benefit
from the same policy.   Note: this requires changes to
autobuild-ceph and ceph-build scripts, which currently copy
only the dist tarball to the rpmbuild/SOURCES dir.

Signed-off-by: Erik Logtenberg <erik@logtenberg.eu>
Signed-off-by: Dan Mick <dan.mick@inktank.com>:
(cherry picked from commit 461523b06cdf93e32f1d8b354ac3799e73162d33)

diff --git a/ceph.spec.in b/ceph.spec.in
index c477613033682f0efbbec5b28a3d1f98d2232fca..66a3d10c5c2dfd7d62a019609676d1e6ed708f99 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -16,6 +16,9 @@ License:      GPL-2.0
 Group:         System Environment/Base
 URL:           http://ceph.com/
 Source0:       http://ceph.com/download/%{name}-%{version}.tar.bz2
+%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel_version}
+Patch0:                init-ceph.in-fedora.patch
+%endif
 Requires:      librbd1 = %{version}-%{release}
 Requires:      librados2 = %{version}-%{release}
 Requires:      libcephfs1 = %{version}-%{release}
@@ -291,6 +294,9 @@ librbd1 or libcephfs1 instead.
 #################################################################################
 %prep
 %setup -q
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+%patch0 -p1 -b .init
+%endif
 
 %build
 # Find jni.h

diff --git a/init-ceph.in-fedora.patch b/init-ceph.in-fedora.patch
new file mode 100644 (file)
index 0000000..ff741f3
--- /dev/null
+++ b/init-ceph.in-fedora.patch
@@ -0,0 +1,18 @@
+diff -up ceph-0.46/src/init-ceph.in.orig ceph-0.46/src/init-ceph.in
+--- ceph-0.46/src/init-ceph.in.orig    2012-04-24 16:06:39.000000000 -0400
++++ ceph-0.46/src/init-ceph.in 2012-05-09 16:41:36.500004052 -0400
+@@ -1,11 +1,11 @@
+ #!/bin/sh
+ # Start/stop ceph daemons
+-# chkconfig: 2345 60 80
++# chkconfig: - 60 80
+
+ ### BEGIN INIT INFO
+ # Provides:          ceph
+-# Default-Start:     2 3 4 5
+-# Default-Stop:      0 1 6
++# Default-Start:
++# Default-Stop:
+ # Required-Start:    $remote_fs $named $network $time
+ # Required-Stop:     $remote_fs $named $network $time
+ # Short-Description: Start Ceph distributed file system daemons at boot time