← Back to branch summary

~james-page/ubuntu/vivid/ceph/0.93

« back to all changes in this revision

Viewing changes to debian/patches/firefly-post-release.patch

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-07-30 10:15:40 UTC
  • mfrom: (0.1.29 sid)
  • Revision ID: package-import@ubuntu.com-20140730101540-b7gsn9jqkye4a5ty
Tags: 0.80.5-1
* New upstream stable release:
  - d/p/firefly-post-release.patch: Dropped, no longer required.
  - d/lib{rados2,cephfs1}.symbols: Update with new symbols.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/firefly-post-release.patch
1
 
Last-Update: 2014-07-17
2
 
Forwarded: not-needed
3
 
Origin: upstream
4
 
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
5
 
Description: fixes from "firefly" branch since 0.80.4 release
6
 
 
7
 
--- a/src/ceph-disk
8
 
+++ b/src/ceph-disk
9
 
@@ -2549,9 +2549,9 @@
10
 
 
11
 
 def main():
12
 
     args = parse_args()
13
 
 
14
 
-    loglevel = logging.INFO
15
 
+    loglevel = logging.WARNING
16
 
     if args.verbose:
17
 
         loglevel = logging.DEBUG
18
 
 
19
 
     logging.basicConfig(
20
 
--- a/src/init-ceph.in
21
 
+++ b/src/init-ceph.in
22
 
@@ -43,8 +43,12 @@
23
 
 . $LIBDIR/ceph_common.sh
24
 
 
25
 
 EXIT_STATUS=0
26
 
 
27
 
+# detect systemd
28
 
+SYSTEMD=0
29
 
+grep -qs systemd /proc/1/comm && SYSTEMD=1
30
 
+
31
 
 signal_daemon() {
32
 
     name=$1
33
 
     daemon=$2
34
 
     pidfile=$3
35
 
@@ -271,9 +275,13 @@
36
 
 
37
 
            [ -n "$wrap" ] && runmode="-f &" && runarg="-f"
38
 
            [ -n "$max_open_files" ] && files="ulimit -n $max_open_files;"
39
 
 
40
 
-           cmd="$files $wrap $cmd --cluster $cluster $runmode"
41
 
+           if [ $SYSTEMD -eq 1 ]; then
42
 
+               cmd="systemd-run -r bash -c '$files $cmd --cluster $cluster -f'"
43
 
+           else
44
 
+               cmd="$files $wrap $cmd --cluster $cluster $runmode"
45
 
+           fi
46
 
 
47
 
            if [ $dofsmount -eq 1 ] && [ -n "$fs_devs" ]; then
48
 
                get_conf pre_mount "true" "pre mount command"
49
 
                get_conf fs_type "" "osd mkfs type"