]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: We no longer need redhat-lsb-core 6445/head
authorBoris Ranto <branto@redhat.com>
Fri, 23 Oct 2015 14:39:16 +0000 (16:39 +0200)
committerBoris Ranto <branto@redhat.com>
Mon, 2 Nov 2015 16:04:28 +0000 (17:04 +0100)
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 b93f42df2e7b630d9bc458bb384621a21e2c5e99..38effeab8c2a0061aae29dc42e509e536b57c21e 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 ff80bab63ae9979c04f9069c9068e2ef4989b2f4..8650ed4cd3a5f71c5c019fec0cdef337842ec1a6 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