]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: We no longer need redhat-lsb-core 6363/head
authorBoris Ranto <branto@redhat.com>
Fri, 23 Oct 2015 14:39:16 +0000 (16:39 +0200)
committerBoris Ranto <branto@redhat.com>
Fri, 23 Oct 2015 14:53:41 +0000 (16:53 +0200)
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>
ceph.spec.in
src/init-rbdmap

index b1c143491765a8e4410fe840fae41f62e2a837d2..8f2a6fc06ca8b3bf446b808f8c42b5c1f835757a 100644 (file)
@@ -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
index 5c6092ba88ef8567f51d0fd788cd94bc78296f20..bad2754fa535255461af9f70f5476762b9752377 100755 (executable)
@@ -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