From a434ed2fc6b8605256d4ae4d473f829d9f27da8c Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 19 Jun 2011 18:15:14 +0000 Subject: block-mount: remove explicit lock waits, solves some potential race conditions SVN-Revision: 27226 --- package/block-mount/files/fstab.init | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'package/block-mount/files/fstab.init') diff --git a/package/block-mount/files/fstab.init b/package/block-mount/files/fstab.init index aba50ba93a..f54051ebb7 100644 --- a/package/block-mount/files/fstab.init +++ b/package/block-mount/files/fstab.init @@ -66,13 +66,11 @@ start() { config_load fstab mkdir -p /var/lock - lock -w /var/lock/fstab.lck && { - lock /var/lock/fstab.lck - [ -e /tmp/fstab ] || { - echo '# WARNING: this is an auto generated file, please use uci to set defined filesystems' > /tmp/fstab - } - lock -u /var/lock/fstab.lck + lock /var/lock/fstab.lck + [ -e /tmp/fstab ] || { + echo '# WARNING: this is an auto generated file, please use uci to set defined filesystems' > /tmp/fstab } + lock -u /var/lock/fstab.lck config_foreach do_swapon swap config_foreach do_mount mount config_foreach do_swapon swap # do swap a second time so that swap on filesystems is enabled -- cgit v1.2.3