Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
ceph
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
ceph
Commits
a330d761
Commit
a330d761
authored
Nov 21, 2019
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ceph-volume refuses to installed into /usr/sbin - we should fix its systemd unit then
parent
62fb4ed8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
Makefile
Makefile
+2
-1
ceph-14.2.4-fix_ceph-volume_systemd_unit.patch
ceph-14.2.4-fix_ceph-volume_systemd_unit.patch
+12
-0
No files found.
Makefile
View file @
a330d761
...
@@ -33,7 +33,8 @@ all: ceph-config
...
@@ -33,7 +33,8 @@ all: ceph-config
tar
xf
ceph-14.2.4.tar.gz
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_cpu_detection.patch
patch
-Np1
-d
ceph-14.2.4
<
ceph-14.2.4-fix_tests.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
$(MAKE)
-C
ceph-14.2.4/build
npm_config_cache
=
/build/.npm
hostname
localhost
hostname
localhost
cd
ceph-14.2.4
&&
tar
xf
../ceph-object-corpus.tar.xz
cd
ceph-14.2.4
&&
tar
xf
../ceph-object-corpus.tar.xz
...
...
ceph-14.2.4-fix_ceph-volume_systemd_unit.patch
0 → 100644
View file @
a330d761
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]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment