From: Stephan Renatus <s.renatus@x-ion.de>
Date: Mon, 10 Mar 2014 14:17:41 +0000 (+0100)
Subject: rbdmap: bugfix upstart script
X-Git-Tag: v0.78~57
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aba5b7cccbc8ef27c5b72f0ef6ad7011d630c675;p=ceph.git

rbdmap: bugfix upstart script

It seems like the upstart script is lacking a little behind [the initscript](https://github.com/ceph/ceph/blob/master/src/init-rbdmap#L44-L49); however, this bugfix makes it actually do what it should do.

Before, the bug made the job just ignore all parameters, with the following error in /var/log/upstart/rbdmap.log:

```
rbd map volumes/volume-one
rbd: add failed: (22) Invalid argument
```

Signed-off-by: Stephan Renatus <s.renatus@x-ion.de>
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/upstart/rbdmap.conf b/src/upstart/rbdmap.conf
index a581c2a3745e..eeefec3b2dc6 100644
--- a/src/upstart/rbdmap.conf
+++ b/src/upstart/rbdmap.conf
@@ -27,7 +27,7 @@ pre-start script
             DEV=rbd/$DEV
             ;;
         esac
-        for PARAM in $(echo $PARAM | tr ',' '\n'); do
+        for PARAM in $(echo $PARAMS | tr ',' '\n'); do
             CMDPARAMS="$CMDPARAMS --$(echo $PARAM | tr '=' ' ')"
         done
         if [ ! -b /dev/rbd/$DEV ]; then