From: Karel Striegel <karel.striegel@ipc.be>
Date: Tue, 3 Feb 2015 10:42:06 +0000 (+0100)
Subject: rdb: update init-rbdmap to fix duplicate mount point
X-Git-Tag: v0.93~119^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be05d9dc5e3f3a3c962d5ba7559a9b9e7cd6b40b;p=ceph.git

rdb: update init-rbdmap to fix duplicate mount point

According to the manual 'mount -f' adds an entry in /etc/mtab.
Therefore the 'mount -v' command needs the flag -n to avoid
duplicate entries in /etc/mtab.

Signed-off-by: Karel Striegel <karel@striegel.be>
---

diff --git a/src/init-rbdmap b/src/init-rbdmap
index a4e986318efb0..a9d682681f436 100755
--- a/src/init-rbdmap
+++ b/src/init-rbdmap
@@ -67,7 +67,7 @@ do_map() {
 			## Mount new rbd
 			MNT_RV=""
 			mount --fake /dev/rbd/$DEV >>/dev/null 2>&1 \
-			&& MNT_RV=$(mount -v /dev/rbd/$DEV 2>&1)
+			&& MNT_RV=$(mount -vn /dev/rbd/$DEV 2>&1)
 			[ -n "${MNT_RV}" ] && log_action_msg "mount: ${MNT_RV}"
 
 			## post-mapping