Commit a330d761 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

ceph-volume refuses to installed into /usr/sbin - we should fix its systemd unit then

parent 62fb4ed8
......@@ -33,7 +33,8 @@ all: ceph-config
tar xf ceph-14.2.4.tar.gz
patch -Np1 -d ceph-14.2.4 < ceph-14.2.4-fix_cpu_detection.patch
patch -Np1 -d ceph-14.2.4 < ceph-14.2.4-fix_tests.patch
cd ceph-14.2.4 && ./do_cmake.sh -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LIBEXECDIR=/lib -DCMAKE_INSTALL_FULL_SBINDIR=/usr/sbin -DWITH_SPDK=OFF -DWITH_RDMA=OFF -DWITH_RADOSGW_AMQP_ENDPOINT=OFF
patch -Np1 -d ceph-14.2.4 < ceph-14.2.4-fix_ceph-volume_systemd_unit.patch
cd ceph-14.2.4 && ./do_cmake.sh -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LIBEXECDIR=/lib -DWITH_SPDK=OFF -DWITH_RDMA=OFF -DWITH_RADOSGW_AMQP_ENDPOINT=OFF
$(MAKE) -C ceph-14.2.4/build npm_config_cache=/build/.npm
hostname localhost
cd ceph-14.2.4 && tar xf ../ceph-object-corpus.tar.xz
......
diff -uNr ceph-14.2.4/systemd/ceph-volume@.service ceph-14.2.4-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service
--- ceph-14.2.4/systemd/ceph-volume@.service 2019-09-14 03:37:41.000000000 +0930
+++ ceph-14.2.4-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service 2019-11-21 09:51:28.143608923 +1030
@@ -7,7 +7,7 @@
Type=oneshot
KillMode=none
Environment=CEPH_VOLUME_TIMEOUT=10000
-ExecStart=/bin/sh -c 'timeout $CEPH_VOLUME_TIMEOUT /usr/sbin/ceph-volume-systemd %i'
+ExecStart=/bin/sh -c 'timeout $CEPH_VOLUME_TIMEOUT /usr/bin/ceph-volume-systemd %i'
TimeoutSec=0
[Install]
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment