Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| de8bfba2ef | |||
| f71517fa89 | |||
| d84f5c5288 | |||
| 8d46a4a552 |
@@ -0,0 +1,2 @@
|
||||
ceph-*.tar.*
|
||||
*.src.rpm
|
||||
@@ -0,0 +1,13 @@
|
||||
--- ceph-0.80.5/src/perfglue/heap_profiler.cc.orig 2014-08-15 16:05:00.161794290 +0200
|
||||
+++ ceph-0.80.5/src/perfglue/heap_profiler.cc 2014-08-15 16:05:04.691794305 +0200
|
||||
@@ -12,8 +12,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-#include <google/heap-profiler.h>
|
||||
-#include <google/malloc_extension.h>
|
||||
+#include <gperftools/heap-profiler.h>
|
||||
+#include <gperftools/malloc_extension.h>
|
||||
#include "heap_profiler.h"
|
||||
#include "common/environment.h"
|
||||
#include "common/LogClient.h"
|
||||
@@ -0,0 +1,11 @@
|
||||
--- ceph-0.80.5/src/test/Makefile.am.orig 2014-08-15 16:30:18.831799418 +0200
|
||||
+++ ceph-0.80.5/src/test/Makefile.am 2014-08-15 16:23:17.758464663 +0200
|
||||
@@ -642,7 +642,7 @@ bin_DEBUGPROGRAMS += ceph_test_librbd
|
||||
if LINUX
|
||||
ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
|
||||
ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm
|
||||
-ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
|
||||
+ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
|
||||
bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
|
||||
endif
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 369daeeb447154016f774d16f1b618cdaaf575d5 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Fri, 31 Oct 2014 03:27:46 +0100
|
||||
Subject: [PATCH] Remove systemd detection in ceph init script, rhbz#1157938
|
||||
|
||||
---
|
||||
src/init-ceph.in | 10 +---------
|
||||
1 file changed, 1 insertion(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/init-ceph.in b/src/init-ceph.in
|
||||
index 95723b0..1effb56 100644
|
||||
--- a/src/init-ceph.in
|
||||
+++ b/src/init-ceph.in
|
||||
@@ -44,10 +44,6 @@ test -f $LIBDIR/ceph_common.sh || exit 0
|
||||
|
||||
EXIT_STATUS=0
|
||||
|
||||
-# detect systemd
|
||||
-SYSTEMD=0
|
||||
-grep -qs systemd /proc/1/comm && SYSTEMD=1
|
||||
-
|
||||
signal_daemon() {
|
||||
name=$1
|
||||
daemon=$2
|
||||
@@ -276,11 +272,7 @@ for name in $what; do
|
||||
[ -n "$wrap" ] && runmode="-f &" && runarg="-f"
|
||||
[ -n "$max_open_files" ] && files="ulimit -n $max_open_files;"
|
||||
|
||||
- if [ $SYSTEMD -eq 1 ]; then
|
||||
- cmd="systemd-run -r bash -c '$files $cmd --cluster $cluster -f'"
|
||||
- else
|
||||
- cmd="$files $wrap $cmd --cluster $cluster $runmode"
|
||||
- fi
|
||||
+ cmd="$files $wrap $cmd --cluster $cluster $runmode"
|
||||
|
||||
if [ $dofsmount -eq 1 ] && [ -n "$fs_devs" ]; then
|
||||
get_conf pre_mount "true" "pre mount command"
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
outdated version, obsoleted by packages in CentOS Storage SIG
|
||||
Reference in New Issue
Block a user