From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 26 May 2017 12:48:05 +0000 (+0200)
Subject: Revert "sysupgrade: run only one instance at a time."
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=361c8b4ee4a20035d4c967d9d67db90d53e924a2;p=openwrt%2Fstaging%2Fblogic.git

Revert "sysupgrade: run only one instance at a time."

This reverts commit e96a9a9af82c00dcce606a84a7bb87a00411385d.

The change breaks sysupgrade through LuCI and two-stage sysupgrade on
NAND targets. There is also a mismatch of file paths in lock and unlock
operations.

This commit was apparently neither properly tested, nor reviewed, so
drop it for now.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 1eede14b05d2..c095ca81c50c 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -47,20 +47,6 @@ while [ -n "$1" ]; do
 	shift;
 done
 
-# just one instance
-if  ! lock -n /tmp/sysupgrade.lock
-then
-	echo "Another instance of sysupgrade already running"
-	echo "If you are sure this is wrong remove file /tmp/sysupgrade.lock"
-	exit 1
-fi
-
-# make sure the lock is removed when done even when killed
-finish() {
-	lock -u /var/sysupgrade.lock
-}
-trap finish EXIT INT TERM
-
 export CONFFILES=/tmp/sysupgrade.conffiles
 export CONF_TAR=/tmp/sysupgrade.tgz