diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2017-05-26 14:48:05 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2017-05-26 14:49:08 +0200 |
| commit | 361c8b4ee4a20035d4c967d9d67db90d53e924a2 (patch) | |
| tree | a2e1affcdf6d4b932a16c43dab29f2ef68cac9be | |
| parent | abbfcc85259a4f6658c61e99dd3d2d3567e3eb3a (diff) | |
| download | upstream-361c8b4ee4a20035d4c967d9d67db90d53e924a2.tar.gz upstream-361c8b4ee4a20035d4c967d9d67db90d53e924a2.tar.bz2 upstream-361c8b4ee4a20035d4c967d9d67db90d53e924a2.zip | |
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>
| -rwxr-xr-x | package/base-files/files/sbin/sysupgrade | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 1eede14b05..c095ca81c5 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 |