From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Fri, 20 Jun 2008 15:10:36 +0000 (+0000)
Subject: Repeated bind mounts to the same dir is possible.  Check before mounting again.
X-Git-Tag: vsys-0.7-14~3
X-Git-Url: http://git.onelab.eu/?p=vsys.git;a=commitdiff_plain;h=39542eae9900f198e7f265630a1da837e193d774

Repeated bind mounts to the same dir is possible.  Check before mounting again.
---

diff --git a/factory/pfmount b/factory/pfmount
index 7c27d16..fb7ee6c 100755
--- a/factory/pfmount
+++ b/factory/pfmount
@@ -3,5 +3,8 @@
 
 #mount --bind /usr/local/fprobe /vservers/$1/pf
 # changed from request of Faiyaz
-mount --bind /var/local/fprobe /vservers/$1/pf
-
+DEST="/vservers/$1/pf"
+mount | grep "on $DEST type" > /dev/null
+if [ $? -eq 1 ]; then
+    mount --bind /var/local/fprobe $DEST
+fi