Fix for Bug 6962

nimbusproject · Apr 12, 2010 · 6794454 · 6794454
1 parent 10030d4
commit 6794454
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/control/libexec/workspace-control/kvm-ebtables-config.sh b/control/libexec/workspace-control/kvm-ebtables-config.sh
@@ -49,6 +49,14 @@ EBTABLES=ebtables
 #EBTABLES=/sbin/ebtables
 #EBTABLES=/usr/sbin/ebtables
 
+FLOCKFILE=/var/lock/ebtables.config.lock
+FLOCK=/usr/bin/flock
+if [ ! -f $FLOCK ]; then
+  echo "*** can not find flock program, disabling"
+  echo "*** disabling flock might result in a error like \"kernel doesn't support a certain ebtables extension\""
+  FLOCK=/bin/true
+fi
+
 
 #############
 # ARGUMENTS #
@@ -158,6 +166,8 @@ function rem_input_rule() {
 ##########################
 #### SUBCOMMAND IMPLS ####
 ##########################
+(
+$FLOCK -x 200
 
 if [ "$ADDREM" = "rem" ]; then
 
@@ -203,3 +213,5 @@ if [ "$ADDREM" = "add" ]; then
     exit 0
   fi
 fi
+
+) 200>$FLOCKFILE
diff --git a/control/libexec/workspace-control/xen-ebtables-config.sh b/control/libexec/workspace-control/xen-ebtables-config.sh
@@ -56,6 +56,14 @@ EBTABLES=ebtables
 #EBTABLES=/sbin/ebtables
 #EBTABLES=/usr/sbin/ebtables
 
+FLOCKFILE=/var/lock/ebtables.config.lock
+FLOCK=/usr/bin/flock
+if [ ! -O $FLOCK ]; then
+  echo "*** can not find flock program, disabling"
+  echo "*** disabling flock might result in a error like \"kernel doesn't support a certain ebtables extension\""
+  FLOCK=/bin/true
+fi
+
 
 #############
 # ARGUMENTS #
@@ -197,6 +205,8 @@ function rem_forward_rule() {
 ##########################
 #### SUBCOMMAND IMPLS ####
 ##########################
+(
+$FLOCK -x 200
 
 if [ "$ADDREM" = "rem" ]; then
 
@@ -251,3 +261,5 @@ if [ "$ADDREM" = "add" ]; then
     exit 0
   fi
 fi
+
+) 200>$FLOCKFILE