diff options
| author | Sage Weil <sage@inktank.com> | 2013-04-24 08:51:25 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-04-24 08:51:25 -0700 |
| commit | 14777ec1b50ed155cd5eb333cc4b323464233e14 (patch) | |
| tree | b14a1fe91790bf3d6bc185182f0c0a06072425ee /ceph.spec.in | |
| parent | 31399d1776ade30a71da77e087b898ea1d357cb5 (diff) | |
| parent | c7a0477bad6bfbec4ef325295ca0489ec1977926 (diff) | |
| download | ceph-14777ec1b50ed155cd5eb333cc4b323464233e14.tar.gz | |
Merge remote-tracking branch 'gh/next'
Conflicts:
ceph.spec.in
Diffstat (limited to 'ceph.spec.in')
| -rw-r--r-- | ceph.spec.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ceph.spec.in b/ceph.spec.in index a2b504d2d2f..023258cbe61 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -25,10 +25,11 @@ Requires: librbd1 = %{version}-%{release} Requires: librados2 = %{version}-%{release} Requires: libcephfs1 = %{version}-%{release} Requires: python +Requires: python-argparse +Requires: python-lockfile Requires: cryptsetup Requires: parted Requires: util-linux -Requires: python-argparse Requires: hdparm Requires(post): binutils BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -301,7 +302,11 @@ chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.fetch_config # udev rules install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rules +%if 0%{?centos} +install -m 0644 -D udev/95-ceph-osd-alt.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules +%else install -m 0644 -D udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules +%endif #set up placeholder directories mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ceph @@ -386,6 +391,7 @@ fi %{_sbindir}/ceph-disk %{_sbindir}/ceph-disk-activate %{_sbindir}/ceph-disk-prepare +%{_sbindir}/ceph-disk-udev %{_sbindir}/ceph-create-keys %{_sbindir}/rcceph /sbin/mkcephfs |