commit: c93f06ce2ecec595db4759cc11b29d5a1f0164bc
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 06:23:04 2015 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 07:45:45 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93f06ce
sys-cluster/ceph: bump to 9.2.0
add user/group: ceph
now sys-cluster/ceph run in normal user 'ceph' instead of 'root'
Package-Manager: portage-2.2.26
sys-cluster/ceph/Manifest | 3 +-
sys-cluster/ceph/ceph-0.94.4.ebuild | 159 ---------------------
sys-cluster/ceph/ceph-10.0.0.ebuild | 18 ++-
.../ceph/{ceph-9.0.3.ebuild => ceph-9.2.0.ebuild} | 20 +--
sys-cluster/ceph/ceph-9999.ebuild | 17 ++-
sys-cluster/ceph/files/README.gentoo | 7 +
.../ceph/files/ceph-0.87.1-glibc-2.20.patch | 59 --------
sys-cluster/ceph/files/ceph-fix-gnustack.patch | 22 ---
sys-cluster/ceph/files/ceph-mds_at.service | 12 --
sys-cluster/ceph/files/ceph-mon_at.service | 19 ---
sys-cluster/ceph/files/ceph-osd_at.service | 13 --
sys-cluster/ceph/files/ceph.initd-r1 | 8 +-
12 files changed, 50 insertions(+), 307 deletions(-)
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index a4df18b..ea635f0 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,5 +1,4 @@
DIST ceph-0.80.10.tar.bz2 4136018 SHA256
a7ca8a3d0710ab88adcd5c52aebe0a8ee573e247c1ccf5d84eea8a9ff07a51fa SHA512
7823a489b7654457512d300050410b4a91d615fbb467d341c76e76b77364d6a2afa763bceb2c6cd8ed05a45d7b0aef4c3baf80155cc3223e940b439e0571f3c9
WHIRLPOOL
a03fc3a4ca8c49157ff3b51528418ca62c3520c4141e402863cf3475a11b240be5297f731bf1a4e77a01a476e80f5e06c0722d688fbb8ad2db26ef1975a450da
-DIST ceph-0.94.4.tar.bz2 7082496 SHA256
09b3a134c4eb06f770a72769d2aec3900c2c7f1d25092f93b0e8e73ab17e577c SHA512
3ae714d110d63717e7e49d07ac5523cbbd06b8fa140b842576f6afea780aec2408ccd053c109bf5e011018ff1c544366113e83e09ea79925e32d46e7360317ab
WHIRLPOOL
8b53fb0410e6168d6385360005b29b919d7d4f255e06cc874fcbb35f1dc5566c0e97bbce50ec7ea2da479a0f068bf254abec474d155186085d500a0f4ea9eb01
DIST ceph-0.94.5.tar.bz2 7084809 SHA256
7658bec8cf6e6c8f5ceb1e85116c4df2582c497ae686295abebc6fc82ec79211 SHA512
8bf57eceda37ec058bd7b9cf98ba0eda11c361156da4cea0aa99a3059d61fc2120ebb27f1bb07bae42e13836b57a5db8f3888401481e9125780a6df21ca90529
WHIRLPOOL
cfedf299f86e19ff87615e851e4639d4045c0e26756d8896498e2e6eb8304808bc78837ec68b01936abd7fd2563aafe973109ba72d66b368304c38e38fc680f5
DIST ceph-10.0.0.tar.gz 10429823 SHA256
fd92052e0de135e1f35ea2add44b5b8add28a2a8235639d69c33cced06a4a357 SHA512
f0e36bf83c97d1dc0328fbba96897e583c6d29b11dc54ea7fa0186ffaa1cf4d26519f336083825d64dda70bd290dc45bd6f3f17ff67ada33322caee5f2f3ce07
WHIRLPOOL
f443ab25ab8f89455d76f509f215b55519f9338d3b9daec318b097de4dffff7009a01521da0d963c4b5549485b6aebca1c0a705746cf2e64fef8e9f5e66676cf
-DIST ceph-9.0.3.tar.bz2 7082795 SHA256
98ad66b35d3747d56e04fcf32a5387b765f86f43c6f09393fe9c7f17e4ae5418 SHA512
fdaebf26076490394229ef1716278ae82e6397651e25b911553db9f93b0d7ba8849320d770aef1363952e7c8e672616f5e61523fc4b79642fe81f1d2d71c4225
WHIRLPOOL
cc11218246efe1d1f0a095ddc3466eacc64ffd032093cc0642a420ed9eb7fdd956b25693cc46e2dace216a6ec577c1c4d26457cf86f0319fe71c5a1125342128
+DIST ceph-9.2.0.tar.bz2 7663088 SHA256
706d33e097b4489a75cfaff8d835e05d91df6dac5cdd3a32a57404f0522dbdbb SHA512
d462f2e4696873552b232f0b89bcda8ddb0cddeab89cbab58e99eb068acb082a42cb558898bd4dee66239df64d15992cfd1c1158217b2ce60a465e1761bcea78
WHIRLPOOL
d016b873a26afef4816921e5b9cbaae3ba4c9ece6683e3d60b1f689ab7dcc285bc386963e83b410a66a313cc953b7d0d9baa427b3b3eb12697daa08f3a5a6a18
diff --git a/sys-cluster/ceph/ceph-0.94.4.ebuild
b/sys-cluster/ceph/ceph-0.94.4.ebuild
deleted file mode 100644
index 1a2b052..0000000
--- a/sys-cluster/ceph/ceph-0.94.4.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-if [[ $PV = *9999* ]]; then
- scm_eclass=git-r3
- EGIT_REPO_URI="
- git://github.com/ceph/ceph.git
- https://github.com/ceph/ceph.git";
- SRC_URI=""
-else
- SRC_URI="http://ceph.com/download/${P}.tar.bz2";
-fi
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-inherit check-reqs autotools eutils multilib python-single-r1 udev
readme.gentoo systemd ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/";
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw
static-libs jemalloc tcmalloc xfs zfs"
-
-CDEPEND="
- app-arch/snappy
- dev-libs/boost:=[threads]
- dev-libs/fcgi
- dev-libs/libaio
- dev-libs/libedit
- dev-libs/leveldb[snappy]
- nss? ( dev-libs/nss )
- cryptopp? ( dev-libs/crypto++ )
- sys-apps/keyutils
- sys-apps/util-linux
- dev-libs/libxml2
- babeltrace? ( dev-util/babeltrace )
- fuse? ( sys-fs/fuse )
- libatomic? ( dev-libs/libatomic_ops )
- xfs? ( sys-fs/xfsprogs )
- zfs? ( sys-fs/zfs )
- gtk? (
- x11-libs/gtk+:2
- dev-cpp/gtkmm:2.4
- gnome-base/librsvg
- )
- radosgw? (
- dev-libs/fcgi
- dev-libs/expat
- net-misc/curl
- )
- jemalloc? ( dev-libs/jemalloc )
- !jemalloc? ( dev-util/google-perftools )
- lttng? ( dev-util/lttng-ust )
- ${PYTHON_DEPS}
- "
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- sys-apps/hdparm
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- "
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ^^ ( nss cryptopp )
- ?? ( jemalloc tcmalloc )
- "
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.79-libzfs.patch
-)
-CHECKREQS_DISK_BUILD="1400M"
-
-pkg_setup() {
- python_setup
-}
-
-src_prepare() {
- [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --without-hadoop
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
- --includedir=/usr/include
- $(use_with debug)
- $(use_with fuse)
- $(use_with libaio)
- $(use_with libatomic libatomic-ops)
- $(use_with nss)
- $(use_with cryptopp)
- $(use_with radosgw)
- $(use_with gtk gtk2)
- $(use_enable static-libs static)
- $(use_with jemalloc)
- $(use_with xfs libxfs)
- $(use_with zfs libzfs)
- --without-kinetic
- --without-librocksdb
- $(use_with lttng )
- $(use_with babeltrace)
- )
-
- use jemalloc || \
- myeconfargs+=( $(usex tcmalloc " --with-tcmalloc" "
--with-tcmalloc-minimal") )
-
- PYTHON="${EPYTHON}" \
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- prune_libtool_files --all
-
- exeinto /usr/$(get_libdir)/ceph
- newexe src/init-ceph ceph_init.sh
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}"/ceph.logrotate ${PN}
-
- chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
-
- keepdir /var/lib/${PN}
- keepdir /var/lib/${PN}/tmp
- keepdir /var/log/${PN}/stat
-
- newinitd "${FILESDIR}/rbdmap.initd" rbdmap
- newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-
- systemd_dounit "${FILESDIR}/ceph.target"
- systemd_newunit "${FILESDIR}/ceph-mds_at.service"
"[email protected]"
- systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf"
"[email protected]"
- systemd_newunit "${FILESDIR}/ceph-osd_at.service"
"[email protected]"
- systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf"
"[email protected]"
- systemd_newunit "${FILESDIR}/ceph-mon_at.service"
"[email protected]"
- systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf"
"[email protected]"
-
- python_fix_shebang \
- "${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
- "${ED}"/usr/bin/{ceph,ceph-rest-api}
-
- #install udev rules
- udev_dorules udev/50-rbd.rules
- udev_dorules udev/95-ceph-osd.rules
-
- readme.gentoo_create_doc
-}
diff --git a/sys-cluster/ceph/ceph-10.0.0.ebuild
b/sys-cluster/ceph/ceph-10.0.0.ebuild
index e2936b9..acb485b 100644
--- a/sys-cluster/ceph/ceph-10.0.0.ebuild
+++ b/sys-cluster/ceph/ceph-10.0.0.ebuild
@@ -16,7 +16,7 @@ else
fi
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-inherit check-reqs autotools eutils multilib python-single-r1 udev
readme.gentoo systemd ${scm_eclass}
+inherit check-reqs autotools eutils multilib python-single-r1 udev user
readme.gentoo systemd ${scm_eclass}
DESCRIPTION="Ceph distributed filesystem"
HOMEPAGE="http://ceph.com/";
@@ -75,7 +75,6 @@ STRIP_MASK="/usr/lib*/rados-classes/*"
PATCHES=(
"${FILESDIR}"/${PN}-0.79-libzfs.patch
)
-CHECKREQS_DISK_BUILD="1400M"
check-reqs_export_vars() {
# check-reqs does not support use flags, and there is a lot of
variability
@@ -93,10 +92,16 @@ check-reqs_export_vars() {
fi
}
+user_setup() {
+ enewgroup ceph
+ enewuser ceph -1 -1 /var/lib/ceph ceph
+}
+
pkg_setup() {
python_setup
check-reqs_export_vars
check-reqs_pkg_setup
+ user_setup
}
src_prepare() {
@@ -132,6 +137,7 @@ src_configure() {
--without-librocksdb
$(use_with lttng )
$(use_with babeltrace)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
)
use jemalloc || \
@@ -158,21 +164,19 @@ src_install() {
keepdir /var/lib/${PN}/tmp
keepdir /var/log/${PN}/stat
+ fowners ceph:ceph /var/lib/ceph
+
newinitd "${FILESDIR}/rbdmap.initd" rbdmap
newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
- systemd_dounit "${FILESDIR}/ceph.target"
- systemd_newunit "${FILESDIR}/ceph-mds_at.service"
"[email protected]"
systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf"
"[email protected]"
- systemd_newunit "${FILESDIR}/ceph-osd_at.service"
"[email protected]"
systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf"
"[email protected]"
- systemd_newunit "${FILESDIR}/ceph-mon_at.service"
"[email protected]"
systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf"
"[email protected]"
python_fix_shebang \
"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
- "${ED}"/usr/bin/{ceph,ceph-rest-api}
+ "${ED}"/usr/bin/{ceph,ceph-rest-api,ceph-detect-init,ceph-brag}
#install udev rules
udev_dorules udev/50-rbd.rules
diff --git a/sys-cluster/ceph/ceph-9.0.3.ebuild
b/sys-cluster/ceph/ceph-9.2.0.ebuild
similarity index 89%
rename from sys-cluster/ceph/ceph-9.0.3.ebuild
rename to sys-cluster/ceph/ceph-9.2.0.ebuild
index c50d81a..434fd90 100644
--- a/sys-cluster/ceph/ceph-9.0.3.ebuild
+++ b/sys-cluster/ceph/ceph-9.2.0.ebuild
@@ -16,7 +16,7 @@ else
fi
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-inherit check-reqs autotools eutils multilib python-single-r1 udev
readme.gentoo systemd ${scm_eclass}
+inherit check-reqs autotools eutils multilib python-single-r1 udev user
readme.gentoo systemd ${scm_eclass}
DESCRIPTION="Ceph distributed filesystem"
HOMEPAGE="http://ceph.com/";
@@ -75,7 +75,6 @@ STRIP_MASK="/usr/lib*/rados-classes/*"
PATCHES=(
"${FILESDIR}"/${PN}-0.79-libzfs.patch
)
-CHECKREQS_DISK_BUILD="1400M"
check-reqs_export_vars() {
# check-reqs does not support use flags, and there is a lot of
variability
@@ -88,15 +87,21 @@ check-reqs_export_vars() {
export CHECKREQS_DISK_BUILD="23G"
export CHECKREQS_DISK_USR="7G"
else
- export CHECKREQS_DISK_BUILD="1400M"
+ export CHECKREQS_DISK_BUILD="9G"
export CHECKREQS_DISK_USR="450M"
fi
}
+user_setup() {
+ enewgroup ceph
+ enewuser ceph -1 -1 /var/lib/ceph ceph
+}
+
pkg_setup() {
python_setup
check-reqs_export_vars
check-reqs_pkg_setup
+ user_setup
}
src_prepare() {
@@ -132,6 +137,7 @@ src_configure() {
--without-librocksdb
$(use_with lttng )
$(use_with babeltrace)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
)
use jemalloc || \
@@ -158,21 +164,19 @@ src_install() {
keepdir /var/lib/${PN}/tmp
keepdir /var/log/${PN}/stat
+ fowners ceph:ceph /var/lib/ceph
+
newinitd "${FILESDIR}/rbdmap.initd" rbdmap
newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
- systemd_dounit "${FILESDIR}/ceph.target"
- systemd_newunit "${FILESDIR}/ceph-mds_at.service"
"[email protected]"
systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf"
"[email protected]"
- systemd_newunit "${FILESDIR}/ceph-osd_at.service"
"[email protected]"
systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf"
"[email protected]"
- systemd_newunit "${FILESDIR}/ceph-mon_at.service"
"[email protected]"
systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf"
"[email protected]"
python_fix_shebang \
"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
- "${ED}"/usr/bin/{ceph,ceph-rest-api}
+ "${ED}"/usr/bin/{ceph,ceph-rest-api,ceph-detect-init,ceph-brag}
#install udev rules
udev_dorules udev/50-rbd.rules
diff --git a/sys-cluster/ceph/ceph-9999.ebuild
b/sys-cluster/ceph/ceph-9999.ebuild
index fe924eb..1805e16 100644
--- a/sys-cluster/ceph/ceph-9999.ebuild
+++ b/sys-cluster/ceph/ceph-9999.ebuild
@@ -17,7 +17,7 @@ else
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
fi
-inherit autotools eutils multilib python-any-r1 udev readme.gentoo
${scm_eclass}
+inherit autotools eutils multilib python-any-r1 udev user readme.gentoo
${scm_eclass}
DESCRIPTION="Ceph distributed filesystem"
HOMEPAGE="http://ceph.com/";
@@ -71,8 +71,14 @@ REQUIRED_USE="
STRIP_MASK="/usr/lib*/rados-classes/*"
+user_setup() {
+ enewgroup ceph
+ enewuser ceph -1 -1 /var/lib/ceph ceph
+}
+
pkg_setup() {
python-any-r1_pkg_setup
+ user_setup
}
src_prepare() {
@@ -99,6 +105,7 @@ src_configure() {
$(use_with tcmalloc) \
$(use_with xfs libxfs) \
$(use_with zfs libzfs)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
}
src_install() {
@@ -118,12 +125,18 @@ src_install() {
keepdir /var/lib/${PN}/tmp
keepdir /var/log/${PN}/stat
+ fowners ceph:ceph /var/lib/ceph
+
newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+ systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf"
"[email protected]"
+ systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf"
"[email protected]"
+ systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf"
"[email protected]"
+
python_fix_shebang \
"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
- "${ED}"/usr/bin/{ceph,ceph-rest-api}
+ "${ED}"/usr/bin/{ceph,ceph-rest-api,ceph-detect-init,ceph-brag}
#install udev rules
udev_dorules udev/50-rbd.rules
diff --git a/sys-cluster/ceph/files/README.gentoo
b/sys-cluster/ceph/files/README.gentoo
index b049515..c596120 100644
--- a/sys-cluster/ceph/files/README.gentoo
+++ b/sys-cluster/ceph/files/README.gentoo
@@ -16,3 +16,10 @@
net-misc/ntp
net-misc/openntpd
net-misc/chrony
+
+4) Starting from version 9.0.x, Ceph daemons run as ‘ceph’ user instead root.
+ In order to fix this, we suggest to stop ceph daemons, and fix ownership
+
+ chown -R ceph:ceph /var/lib/ceph
+
+ https://ceph.com/releases/v9-2-0-infernalis-released/
diff --git a/sys-cluster/ceph/files/ceph-0.87.1-glibc-2.20.patch
b/sys-cluster/ceph/files/ceph-0.87.1-glibc-2.20.patch
deleted file mode 100644
index 55a49d7..0000000
--- a/sys-cluster/ceph/files/ceph-0.87.1-glibc-2.20.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From cf2104d4d991361c53f6e2fea93b69de10cd654b Mon Sep 17 00:00:00 2001
-From: Federico Simoncelli <[email protected]>
-Date: Sat, 15 Nov 2014 14:14:04 +0000
-Subject: [PATCH] common: do not unlock rwlock on destruction
-
-According to pthread_rwlock_unlock(3p):
-
- Results are undefined if the read-write lock rwlock is not held
- by the calling thread.
-
-and:
-
- https://sourceware.org/bugzilla/show_bug.cgi?id=17561
-
- Calling pthread_rwlock_unlock on an rwlock which is not locked
- is undefined.
-
-calling pthread_rwlock_unlock on RWLock destruction could cause
-an unknown behavior for two reasons:
-
-- the lock is acquired by another thread (undefined)
-- the lock is not acquired (undefined)
-
-Moreover since glibc-2.20 calling pthread_rwlock_unlock on a
-rwlock that is not locked results in a SIGILL that kills the
-application.
-
-This patch removes the pthread_rwlock_unlock call on destruction
-and replaces it with an assertion to check that the RWLock is
-not in use.
-
-Any code that relied on the implicit release is now going to
-break the assertion, e.g.:
-
- {
- RWLock l;
- l.get(for_write);
- } // implicit release, wrong.
-
-Signed-off-by: Federico Simoncelli <[email protected]>
----
- src/common/RWLock.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/common/RWLock.h b/src/common/RWLock.h
-index e647e17..6f0ab8e 100644
---- a/src/common/RWLock.h
-+++ b/src/common/RWLock.h
-@@ -46,7 +46,9 @@ class RWLock
- return (nwlock.read() > 0);
- }
- virtual ~RWLock() {
-- pthread_rwlock_unlock(&L);
-+ // The following check is racy but we are about to destroy
-+ // the object and we assume that there are no other users.
-+ assert(!is_locked());
- pthread_rwlock_destroy(&L);
- }
-
diff --git a/sys-cluster/ceph/files/ceph-fix-gnustack.patch
b/sys-cluster/ceph/files/ceph-fix-gnustack.patch
deleted file mode 100644
index 3e2eace..0000000
--- a/sys-cluster/ceph/files/ceph-fix-gnustack.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/common/crc32c_intel_fast_asm.S
b/src/common/crc32c_intel_fast_asm.S
-index 4ca5d65..68d3426 100644
---- a/src/common/crc32c_intel_fast_asm.S
-+++ b/src/common/crc32c_intel_fast_asm.S
-@@ -662,3 +662,6 @@ global %1_slver
- %endmacro
- ;;; func core, ver, snum
- slversion crc32_iscsi_00, 00, 02, 0014
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endiF
-diff --git a/src/common/crc32c_intel_fast_zero_asm.S
b/src/common/crc32c_intel_fast_zero_asm.S
-index b7246f2..9728be9 100644
---- a/src/common/crc32c_intel_fast_zero_asm.S
-+++ b/src/common/crc32c_intel_fast_zero_asm.S
-@@ -644,3 +644,6 @@ global %1_slver
- %endmacro
- ;;; func core, ver, snum
- slversion crc32_iscsi_zero_00, 00, 02, 0014
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endiF
diff --git a/sys-cluster/ceph/files/ceph-mds_at.service
b/sys-cluster/ceph/files/ceph-mds_at.service
deleted file mode 100644
index c28604e..0000000
--- a/sys-cluster/ceph/files/ceph-mds_at.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Ceph metadata server daemon
-After=network-online.target local-fs.target
-Wants=network-online.target local-fs.target
-PartOf=ceph.target
-
-[Service]
-Environment=CLUSTER=ceph
-ExecStart=/usr/bin/ceph-mds -f --cluster ${CLUSTER} --id %i
-
-[Install]
-WantedBy=ceph.target
diff --git a/sys-cluster/ceph/files/ceph-mon_at.service
b/sys-cluster/ceph/files/ceph-mon_at.service
deleted file mode 100644
index 4f54cc1..0000000
--- a/sys-cluster/ceph/files/ceph-mon_at.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Ceph cluster monitor daemon
-After=network-online.target
-Wants=network-online.target
-
-# According to:
-# http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget
-# these can be removed once ceph-mon will dynamically change network
-# configuration.
-After=network-online.target local-fs.target
-Wants=network-online.target local-fs.target
-PartOf=ceph.target
-
-[Service]
-Environment=CLUSTER=ceph
-ExecStart=/usr/bin/ceph-mon -f --cluster ${CLUSTER} --id %i
-
-[Install]
-WantedBy=ceph.target
diff --git a/sys-cluster/ceph/files/ceph-osd_at.service
b/sys-cluster/ceph/files/ceph-osd_at.service
deleted file mode 100644
index 7bf125f..0000000
--- a/sys-cluster/ceph/files/ceph-osd_at.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Ceph object storage daemon
-After=network-online.target local-fs.target
-Wants=network-online.target local-fs.target
-PartOf=ceph.target
-
-[Service]
-Environment=CLUSTER=ceph
-ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i
-ExecStartPre=/usr/libexec/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id
%i
-
-[Install]
-WantedBy=ceph.target
diff --git a/sys-cluster/ceph/files/ceph.initd-r1
b/sys-cluster/ceph/files/ceph.initd-r1
index ca5ab60..7f1558d 100644
--- a/sys-cluster/ceph/files/ceph.initd-r1
+++ b/sys-cluster/ceph/files/ceph.initd-r1
@@ -22,7 +22,7 @@ is_type_valid() {
}
start_pre() {
- checkpath -d -q $(dirname ${pidfile})
+ checkpath -d -q -o ceph $(dirname ${pidfile})
}
start() {
@@ -31,18 +31,18 @@ start() {
eerror "Please give valid Ceph Server Type: mds, mon, osd"
return 1
fi
- ${command} ${command_args}
+ start-stop-daemon --start -exec ${command} --user ceph --group ceph --
${command_args}
eend $?
}
stop() {
ebegin "Stopping Ceph ${type}.${id}"
- start-stop-daemon --stop --pidfile ${pidfile}
+ start-stop-daemon --stop --user ceph --group ceph --pidfile ${pidfile}
eend $?
}
reload() {
ebegin "Reloading Ceph ${type}.${id}"
- start-stop-daemon --signal 1 --pidfile ${pidfile}
+ start-stop-daemon --signal 1 --user ceph --group ceph --pidfile
${pidfile}
eend $?
}
