From: Loic Dachary <loic@dachary.org>
Date: Thu, 7 May 2015 20:21:26 +0000 (+0200)
Subject: Merge pull request #4532 from dachary/wip-init-system-detection
X-Git-Tag: v9.0.2~221
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0c715f697100afe5e718b47fc46842de21ac1b71;p=ceph.git

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>
---

0c715f697100afe5e718b47fc46842de21ac1b71
diff --cc ceph.spec.in
index d7b6315d222,33e3d1c0665..ae83383a6d7
--- a/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