From f972f38445bc7a6efe122a5f9fc2ba7658625e26 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Fri, 23 Oct 2015 16:39:16 +0200 Subject: [PATCH] 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 (cherry picked from commit 15600572265bed397fbd80bdd2b7d83a0e9bd918) Conflicts: ceph.spec.in Merge conflict because there were other commits that introduced systemd & SUSE specific bits in the master which havent yet reached hammer. Since this commit only removed redhat-lsb-core from *el distros removing the specific lines --- ceph.spec.in | 3 --- src/init-rbdmap | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 140e0e3141a8d..0d8c6d37680eb 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -126,9 +126,6 @@ Requires: python-rados = %{epoch}:%{version}-%{release} Requires: python-rbd = %{epoch}:%{version}-%{release} Requires: python-cephfs = %{epoch}:%{version}-%{release} Requires: python-requests -%if 0%{?rhel} || 0%{?fedora} -Requires: redhat-lsb-core -%endif # python-argparse is only needed in distros with Python 2.6 or lower %if (0%{?rhel} && 0%{?rhel} <= 6) || (0%{?suse_version} && 0%{?suse_version} <= 1110) Requires: python-argparse diff --git a/src/init-rbdmap b/src/init-rbdmap index bb2bf2d7e6410..d779efc0aba0f 100755 --- a/src/init-rbdmap +++ b/src/init-rbdmap @@ -21,7 +21,9 @@ DESC="RBD Mapping:" 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 -- 2.39.5