Merge pull request #4532 from dachary/wip-init-system-detection

ceph-detect-init helper and associated tests

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc Makefile.am
Simple merge

diff --cc ceph.spec.in
index d7b6315d2229f751afc54d3b1b5e75013ce7cc27,33e3d1c0665fa7722e753ed9b20b5d3133623959..ae83383a6d7cac62a00918e98f328c806e0f55e9
--- 1/ceph.spec.in
--- 2/ceph.spec.in
+++ b/ceph.spec.in
@@@ -593,8 -593,8 +593,9 @@@ f
  %{_bindir}/ceph-run
  %{_bindir}/ceph-mon
  %{_bindir}/ceph-mds
 +%{_bindir}/ceph-objectstore-tool
  %{_bindir}/ceph-osd
+ %{_bindir}/ceph-detect-init
  %{_bindir}/librados-config
  %{_bindir}/ceph-client-debug
  %{_bindir}/cephfs-journal-tool

diff --cc debian/ceph.install
Simple merge