Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
init-ceph: do not use systemd-run in sysvinit
`systemd-run` logic in initscripts was introduced because of ticket http://tracker.ceph.com/issues/7627. If we have systemd-based operating system, we should use systemd unit files from systemd directory to start/stop ceph daemons. Otherwise, `daemon()` from `/etc/init.d/functions` on systemd distro starts service in `system.slice` and everything works well. `systemd-run` can not be run on non-systemd distros, so it's not needed on SysV systems. also, ceph-disk is now able to run the "systemctl" to enable and start the ceph-osd, and ceph-deploy is also now playing well with systemd when it comes to ceph-mon and ceph-mds Fixes: http://tracker.ceph.com/issues/16440 Signed-off-by: Vladislav Odintsov <odivlad@gmail.com> (cherry picked from commit 109cfc2) Conflicts: src/init-ceph.in 1. In master there is no comment already about the relative paths when starting daemon as ./init-ceph. 2. In master's initscript there is difference to start in build directory or not. Just remove SYSTEMD_RUN variable. Signed-off-by: Vladislav Odintsov <odivlad@gmail.com>
- Loading branch information