diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-06-19 18:15:14 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-06-19 18:15:14 +0000 |
| commit | a434ed2fc6b8605256d4ae4d473f829d9f27da8c (patch) | |
| tree | c54bea09a8945927223c516cf9586b7f8491b38f | |
| parent | e6af77a1c8e6d0c1d57867ca7aeffcb17fc3ebc4 (diff) | |
| download | upstream-a434ed2fc6b8605256d4ae4d473f829d9f27da8c.tar.gz upstream-a434ed2fc6b8605256d4ae4d473f829d9f27da8c.tar.bz2 upstream-a434ed2fc6b8605256d4ae4d473f829d9f27da8c.zip | |
block-mount: remove explicit lock waits, solves some potential race conditions
SVN-Revision: 27226
| -rw-r--r-- | package/block-mount/Makefile | 2 | ||||
| -rw-r--r-- | package/block-mount/files/block.sh | 36 | ||||
| -rw-r--r-- | package/block-mount/files/fstab.init | 10 |
3 files changed, 21 insertions, 27 deletions
diff --git a/package/block-mount/Makefile b/package/block-mount/Makefile index c2c9d33f13..657f727bb9 100644 --- a/package/block-mount/Makefile +++ b/package/block-mount/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=block-mount PKG_VERSION:=0.2.0 -PKG_RELEASE:=5 +PKG_RELEASE:=6 include $(INCLUDE_DIR)/package.mk diff --git a/package/block-mount/files/block.sh b/package/block-mount/files/block.sh index 72d6c3ab3c..80f74b210b 100644 --- a/package/block-mount/files/block.sh +++ b/package/block-mount/files/block.sh @@ -119,17 +119,15 @@ config_create_swap_fstab_entry() { [ -n "$device" ] || return 0 local fstabnew - + mkdir -p /var/lock - lock -w /var/lock/fstab.lck && { - lock /var/lock/fstab.lck - fstabnew="$(mktemp -t '.fstab.XXXXXXXX')" - cat /tmp/fstab | grep -E -v "^$device[[:blank:]]" >>"$fstabnew" - [ "$enabled" -eq 1 ] && echo "$device none swap sw 0 0" >> "$fstabnew" - cat "$fstabnew" >/tmp/fstab - rm -f $fstabnew - lock -u /var/lock/fstab.lck - } + lock /var/lock/fstab.lck + fstabnew="$(mktemp -t '.fstab.XXXXXXXX')" + cat /tmp/fstab | grep -E -v "^$device[[:blank:]]" >>"$fstabnew" + [ "$enabled" -eq 1 ] && echo "$device none swap sw 0 0" >> "$fstabnew" + cat "$fstabnew" >/tmp/fstab + rm -f $fstabnew + lock -u /var/lock/fstab.lck } config_create_mount_fstab_entry() { @@ -144,17 +142,15 @@ config_create_mount_fstab_entry() { [ -n "$device" ] || return 0 local fstabnew - + mkdir -p /var/lock - lock -w /var/lock/fstab.lck && { - lock /var/lock/fstab.lck - fstabnew="$(mktemp -t '.fstab.XXXXXXXX')" - cat /tmp/fstab | grep -E -v "^$device[[:blank:]]" | grep -v "$target" >>"$fstabnew" - echo "$device $target $fstype $options 0 0" >>"$fstabnew" - cat "$fstabnew" >/tmp/fstab - rm -f $fstabnew - lock -u /var/lock/fstab.lck - } + lock /var/lock/fstab.lck + fstabnew="$(mktemp -t '.fstab.XXXXXXXX')" + cat /tmp/fstab | grep -E -v "^$device[[:blank:]]" | grep -v "$target" >>"$fstabnew" + echo "$device $target $fstype $options 0 0" >>"$fstabnew" + cat "$fstabnew" >/tmp/fstab + rm -f $fstabnew + lock -u /var/lock/fstab.lck } libmount_find_token() { 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 |