diff options
| author | Gary Lowell <glowell@inktank.com> | 2013-03-28 16:12:33 -0700 |
|---|---|---|
| committer | Gary Lowell <glowell@inktank.com> | 2013-03-28 16:12:33 -0700 |
| commit | e950ed07c3b913033349a8052ea24dc42e321f61 (patch) | |
| tree | 60feec623e559de45646ed1b3a596eb29d9de500 /ceph.spec.in | |
| parent | e91405d540ce11b9996e4977212553bd33afb3ed (diff) | |
| download | ceph-e950ed07c3b913033349a8052ea24dc42e321f61.tar.gz | |
ceph.spec.in: Move four scripts from sbin to usr/bin
The ceph-create-keys, ceph-disk, ceph-disk-activate, and
ceph-disk-prepare scripts are built in sbin, but debian installs
them into usr/bin, and several utilities look for them there.
This commit changes the RPM to install them in /usr/bin. (Bug #3921)
Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
Diffstat (limited to 'ceph.spec.in')
| -rw-r--r-- | ceph.spec.in | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ceph.spec.in b/ceph.spec.in index eff258ba87a..1ec35eca2b5 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -315,6 +315,12 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/mds mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/bootstrap-osd mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/bootstrap-mds +# Makefile puts these in sbin, but we want to package them in usr/sbin +mv -f $RPM_BUILD_ROOT/sbin/ceph-disk $RPM_BUILD_ROOT/usr/sbin/ceph-disk +mv -f $RPM_BUILD_ROOT/sbin/ceph-disk-activate $RPM_BUILD_ROOT/usr/sbin/ceph-disk-activate +mv -f $RPM_BUILD_ROOT/sbin/ceph-disk-prepare $RPM_BUILD_ROOT/usr/sbin/ceph-disk-prepare +mv -f $RPM_BUILD_ROOT/sbin/ceph-create-keys $RPM_BUILD_ROOT/usr/sbin/ceph-create-keys + %if %{defined suse_version} # Fedora seems to have some problems with this macro, use it only on SUSE %fdupes -s $RPM_BUILD_ROOT/%{python_sitelib} @@ -425,10 +431,10 @@ fi %{_libdir}/rados-classes/libcls_lock.so* %{_libdir}/rados-classes/libcls_kvs.so* %{_libdir}/rados-classes/libcls_refcount.so* -/sbin/ceph-disk -/sbin/ceph-disk-activate -/sbin/ceph-disk-prepare -/sbin/ceph-create-keys +/usr/sbin/ceph-disk +/usr/sbin/ceph-disk-activate +/usr/sbin/ceph-disk-prepare +/usr/sbin/ceph-create-keys /lib/udev/rules.d/95-ceph-osd.rules #set up placeholder directories |