From: Boris Ranto <branto@redhat.com>
Date: Fri, 23 Oct 2015 14:39:16 +0000 (+0200)
Subject: ceph.spec.in: We no longer need redhat-lsb-core
X-Git-Tag: v9.2.0~3^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=15600572265bed397fbd80bdd2b7d83a0e9bd918;p=ceph.git

ceph.spec.in: We no longer need redhat-lsb-core

Drop the redhat-lsb-core dependency as it is no longer necessary on
fedora/rhel.

The other two init scripts do not use redhat-lsb-core either. The
init-ceph.in conditionally requires /lib/lsb/init-functions and does not
use any of the functions defined in that file (at least not directly).
The init-radosgw file includes /etc/rc.d/init.d/functions on non-debian
platforms instead of /lib/lsb/init-functions file so it does not require
redhat-lsb-core either.

Signed-off-by: Boris Ranto <branto@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index b1c143491765a..8f2a6fc06ca8b 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -227,9 +227,6 @@ Requires:	python-requests
 %if 0%{?_with_systemd}
 %{?systemd_requires}
 %endif
-%if 0%{?rhel} || 0%{?fedora}
-Requires:	redhat-lsb-core
-%endif
 %if 0%{?suse_version}
 Requires(pre):	pwdutils
 %endif
diff --git a/src/init-rbdmap b/src/init-rbdmap
index 5c6092ba88ef8..bad2754fa5352 100755
--- a/src/init-rbdmap
+++ b/src/init-rbdmap
@@ -20,7 +20,9 @@
 
 RBDMAPFILE="/etc/ceph/rbdmap"
 
-. /lib/lsb/init-functions
+if [ -e /lib/lsb/init-functions ]; then
+    . /lib/lsb/init-functions
+fi
 
 do_map() {
 	if [ ! -f "$RBDMAPFILE" ]; then