From: Nathan Cutler <ncutler@suse.com>
Date: Sat, 19 Mar 2016 05:17:54 +0000 (+0100)
Subject: rbdmap: default RBDMAPFILE to reasonable value
X-Git-Tag: v10.1.1~133^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=27bbf3e63cbfe8d9762746e1a701288f8bb1a0f0;p=ceph.git

rbdmap: default RBDMAPFILE to reasonable value

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/src/rbdmap b/src/rbdmap
index 09145b29dbab..3087f56c0a5f 100755
--- a/src/rbdmap
+++ b/src/rbdmap
@@ -1,6 +1,10 @@
 #!/bin/sh
 
 do_map() {
+
+        # default to reasonable value if RBDMAPFILE not set in environment
+        printenv RBDMAPFILE >/dev/null || local RBDMAPFILE=/etc/ceph/rbdmap
+
 	if [ ! -f "$RBDMAPFILE" ]; then
 		logger -p "daemon.warning" -t init-rbdmap "No $RBDMAPFILE found."
 		exit 0