KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit e96a9a9af8.

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>
This commit is contained in:
Jo-Philipp Wich 2017-05-26 14:48:05 +02:00
parent abbfcc8525
commit 361c8b4ee4
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
package/base-files/files/sbin/sysupgrade
View file

@ -47,20 +47,6 @@ while [ -n "$1" ]; do
shift; shift;
done 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 CONFFILES=/tmp/sysupgrade.conffiles
export CONF_TAR=/tmp/sysupgrade.tgz export CONF_TAR=/tmp/sysupgrade.tgz