From f6e200b2d0acef71da446e3c5c2be56420ecd81a Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 25 Mar 2021 10:32:21 +0100 Subject: [PATCH] ceph.spec: prepare openSUSE usrmerge (boo#1029961) The compat symlink in /sbin is no longer required and actually in the way in the usrmerge case. Signed-off-by: Ludwig Nussel (cherry picked from commit e4c4a4ce97fff8a5b4efa747d9cffeabcceedd25) --- ceph.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 45ef1c161ec8..b5b93ee629ce 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -1384,7 +1384,7 @@ touch %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys # firewall templates and /sbin/mount.ceph symlink -%if 0%{?suse_version} +%if 0%{?suse_version} && !0%{?usrmerged} mkdir -p %{buildroot}/sbin ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph %endif @@ -1560,7 +1560,7 @@ exit 0 %{_bindir}/rbd-replay-many %{_bindir}/rbdmap %{_sbindir}/mount.ceph -%if 0%{?suse_version} +%if 0%{?suse_version} && !0%{?usrmerged} /sbin/mount.ceph %endif %if %{with lttng} -- 2.47.3