Commit ecaf92e4 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Place ceph-volume-systemd into /usr/sbin

parent ea0dec54
diff -uNr ceph-15.2.4/systemd/ceph-volume@.service ceph-15.2.4-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service
--- ceph-15.2.4/systemd/ceph-volume@.service 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service 2020-07-07 11:19:46.911351551 +0930
@@ -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]
diff -uNr ceph-15.2.4/cmake/modules/Distutils.cmake ceph-15.2.4-fix_ceph-volume_systemd_unit/cmake/modules/Distutils.cmake
--- ceph-15.2.4/cmake/modules/Distutils.cmake 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_ceph-volume_systemd_unit/cmake/modules/Distutils.cmake 2020-12-07 09:34:12.979605660 +1030
@@ -25,9 +25,9 @@
list(APPEND options
--root=\$ENV{DESTDIR}
--single-version-externally-managed)
- if(NOT \"${DU_INSTALL_SCRIPT}\" STREQUAL \"\")
- list(APPEND options --install-script=${DU_INSTALL_SCRIPT})
- endif()
+ endif()
+ if(NOT \"${DU_INSTALL_SCRIPT}\" STREQUAL \"\")
+ list(APPEND options --install-script=${DU_INSTALL_SCRIPT})
endif()
execute_process(
COMMAND ${Python3_EXECUTABLE}
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