Place ceph-volume-systemd into /usr/sbin

ecaf92e4 · Vladimir Bashkirtsev · ea0dec54 · ecaf92e4
Commit ecaf92e4 authored Dec 27, 2020 by Vladimir Bashkirtsev
Show whitespace changes
Inline Side-by-side

Showing with 16 additions and 12 deletions

ceph-15.2.4-fix_ceph-volume_systemd_unit.patch ceph-15.2.4-fix_ceph-volume_systemd_unit.patch +16 -12

No files found.
--- a/ceph-15.2.4-fix_ceph-volume_systemd_unit.patch
+++ b/ceph-15.2.4-fix_ceph-volume_systemd_unit.patch
-diff -uNr ceph-15.2.4/systemd/ceph-volume@.service ceph-15.2.4-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service
+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/systemd/ceph-volume@.service	2020-07-01 01:10:51.000000000 +0930
+--- 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/systemd/ceph-volume@.service	2020-07-07 11:19:46.911351551 +0930
+++ ceph-15.2.4-fix_ceph-volume_systemd_unit/cmake/modules/Distutils.cmake	2020-12-07 09:34:12.979605660 +1030
-@@ -7,7 +7,7 @@
+@@ -25,9 +25,9 @@
- Type=oneshot
+       list(APPEND options
- KillMode=none
+         --root=\$ENV{DESTDIR}
- Environment=CEPH_VOLUME_TIMEOUT=10000
+         --single-version-externally-managed)
-ExecStart=/bin/sh -c 'timeout $CEPH_VOLUME_TIMEOUT /usr/sbin/ceph-volume-systemd %i'
+-      if(NOT \"${DU_INSTALL_SCRIPT}\" STREQUAL \"\")
-+ExecStart=/bin/sh -c 'timeout $CEPH_VOLUME_TIMEOUT /usr/bin/ceph-volume-systemd %i'
+-        list(APPEND options --install-script=${DU_INSTALL_SCRIPT})
- TimeoutSec=0
+-      endif()
+    endif()
- [Install]
+    if(NOT \"${DU_INSTALL_SCRIPT}\" STREQUAL \"\")
+      list(APPEND options --install-script=${DU_INSTALL_SCRIPT})
+     endif()
+     execute_process(
+     COMMAND ${Python3_EXECUTABLE}