← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/bug-8342.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/bug-8342.patch
11
11
 
12
12
--- a/src/init-ceph.in
13
13
+++ b/src/init-ceph.in
14
 
@@ -338,9 +338,13 @@
15
 
                    osd_location=`$osd_location_hook --cluster ceph --id $id --type osd`
 
14
@@ -339,7 +339,11 @@ for name in $what; do
16
15
                    get_conf osd_weight "" "osd crush initial weight"
17
16
                    defaultweight="$(df -P -k $osd_data/. | tail -1 | awk '{ print sprintf("%.2f",$2/1073741824) }')"
18
17
                    get_conf osd_keyring "$osd_data/keyring" "keyring"
25
24
                fi
26
25
            fi
27
26
 
28
 
            echo Starting Ceph $name on $host...
29
 
@@ -352,8 +356,9 @@
30
 
            [ -n "$pre_start" ] && do_cmd "$pre_start"
 
27
@@ -353,6 +357,7 @@ for name in $what; do
31
28
            do_cmd_okfail "$cmd" $runarg
32
29
            if [ "$ERR" != "0" ]; then
33
30
                EXIT_STATUS=$ERR
35
32
            fi
36
33
 
37
34
            if [ "$type" = "mon" ]; then
38
 
                # this will only work if we are using default paths