From 7296d84a5cbd61db072544dd375302811b2d29bf Mon Sep 17 00:00:00 2001
From: Jan Huwald <jh@sotun.de>
Date: Mon, 23 Apr 2012 16:44:49 +0000
Subject: splash: move locking to splash_sync


diff --git a/files/common/etc/splash.sh b/files/common/etc/splash.sh
index 75eb620..222b2f8 100644
--- a/files/common/etc/splash.sh
+++ b/files/common/etc/splash.sh
@@ -3,15 +3,6 @@ chain_prefix=splash_db_
 chain_id_file=/tmp/splash_chain_id
 tbl=/tmp/p2ptbl/splash
 
-lockSplash () {
-    exec 666<$chain_id_file
-    flock -x 666
-}
-
-unlockSplash () {
-    exec 666<&-
-}
-
 have_splash_iptable () {
     state=${1:-$(fsm get inetable)}
     [ "$state" == "queen" ]
diff --git a/files/common/sbin/splash_sync b/files/common/sbin/splash_sync
index bbb4182..aafa49f 100755
--- a/files/common/sbin/splash_sync
+++ b/files/common/sbin/splash_sync
@@ -1,8 +1,11 @@
 #!/bin/sh -e
 . /etc/splash.sh
 
+# acquire lock
+exec 666<$chain_id_file
+flock -x 666
+
 # check for current inetable state, allowing a command line override
-lockSplash
 if have_splash_iptable $1; then
     # remove old entries from splash p2ptbl
     p2ptbl filter $tbl \
-- 
cgit v0.10.1