From 5356f2a8b96c4cfccf529bbb61adf42683cd91b0 Mon Sep 17 00:00:00 2001 From: Leo Zhang Date: Thu, 18 May 2017 14:17:17 +0800 Subject: [PATCH 1/2] build: move bash_completion.d/ceph to ceph-common When only ceph-common is installed, can also use ceph completion Signed-off-by: Leo Zhang --- ceph.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index 40704d68b53..0b02efabe35 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -951,7 +951,6 @@ rm -rf %{buildroot} %{_libdir}/libos_tp.so* %{_libdir}/libosd_tp.so* %endif -%config %{_sysconfdir}/bash_completion.d/ceph %config(noreplace) %{_sysconfdir}/logrotate.d/ceph %if 0%{?fedora} || 0%{?rhel} %config(noreplace) %{_sysconfdir}/sysconfig/ceph @@ -1059,6 +1058,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %{_datadir}/ceph/id_rsa_drop.ceph.com %{_datadir}/ceph/id_rsa_drop.ceph.com.pub %dir %{_sysconfdir}/ceph/ +%config %{_sysconfdir}/bash_completion.d/ceph %config %{_sysconfdir}/bash_completion.d/rados %config %{_sysconfdir}/bash_completion.d/rbd %config %{_sysconfdir}/bash_completion.d/radosgw-admin From 9f90087a451b38c36c3ef4526064db3006262964 Mon Sep 17 00:00:00 2001 From: Leo Zhang Date: Thu, 18 May 2017 17:22:11 +0800 Subject: [PATCH 2/2] build: move bash_completion.d/ceph from debian/ceph-base.install to debian/ceph-common.install when only ceph-common is installed, can also use ceph completion Signed-off-by: Leo Zhang --- debian/ceph-base.install | 1 - debian/ceph-common.install | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/ceph-base.install b/debian/ceph-base.install index 55ba5e20469..95ffe0a8485 100644 --- a/debian/ceph-base.install +++ b/debian/ceph-base.install @@ -1,4 +1,3 @@ -etc/bash_completion.d/ceph etc/init.d/ceph usr/sbin/ceph-create-keys usr/bin/ceph-detect-init diff --git a/debian/ceph-common.install b/debian/ceph-common.install index ba7eb70055d..11e24f49472 100755 --- a/debian/ceph-common.install +++ b/debian/ceph-common.install @@ -1,5 +1,6 @@ #! /usr/bin/dh-exec --with=install +etc/bash_completion.d/ceph etc/bash_completion.d/rados etc/bash_completion.d/radosgw-admin etc/bash_completion.d/rbd