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

block-mount: remove explicit lock waits, solves some potential race conditions

Browse source 
SVN-Revision: 27226
This commit is contained in:
Jo-Philipp Wich 2011-06-19 18:15:14 +00:00
parent e6af77a1c8
commit a434ed2fc6
3 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/block-mount/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=block-mount PKG_NAME:=block-mount
PKG_VERSION:=0.2.0 PKG_VERSION:=0.2.0
PKG_RELEASE:=5 PKG_RELEASE:=6
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

36
package/block-mount/files/block.sh
View file

@ -119,17 +119,15 @@ config_create_swap_fstab_entry() {
[ -n "$device" ] || return 0 [ -n "$device" ] || return 0
local fstabnew local fstabnew
mkdir -p /var/lock mkdir -p /var/lock
lock -w /var/lock/fstab.lck && { lock /var/lock/fstab.lck
lock /var/lock/fstab.lck fstabnew="$(mktemp -t '.fstab.XXXXXXXX')"
fstabnew="$(mktemp -t '.fstab.XXXXXXXX')" cat /tmp/fstab | grep -E -v "^$device[[:blank:]]" >>"$fstabnew"
cat /tmp/fstab | grep -E -v "^$device[[:blank:]]" >>"$fstabnew" [ "$enabled" -eq 1 ] && echo "$device none swap sw 0 0" >> "$fstabnew"
[ "$enabled" -eq 1 ] && echo "$device none swap sw 0 0" >> "$fstabnew" cat "$fstabnew" >/tmp/fstab
cat "$fstabnew" >/tmp/fstab rm -f $fstabnew
rm -f $fstabnew lock -u /var/lock/fstab.lck
lock -u /var/lock/fstab.lck
}
} }
config_create_mount_fstab_entry() { config_create_mount_fstab_entry() {
@ -144,17 +142,15 @@ config_create_mount_fstab_entry() {
[ -n "$device" ] || return 0 [ -n "$device" ] || return 0
local fstabnew local fstabnew
mkdir -p /var/lock mkdir -p /var/lock
lock -w /var/lock/fstab.lck && { lock /var/lock/fstab.lck
lock /var/lock/fstab.lck fstabnew="$(mktemp -t '.fstab.XXXXXXXX')"
fstabnew="$(mktemp -t '.fstab.XXXXXXXX')" cat /tmp/fstab | grep -E -v "^$device[[:blank:]]" | grep -v "$target" >>"$fstabnew"
cat /tmp/fstab | grep -E -v "^$device[[:blank:]]" | grep -v "$target" >>"$fstabnew" echo "$device $target $fstype $options 0 0" >>"$fstabnew"
echo "$device $target $fstype $options 0 0" >>"$fstabnew" cat "$fstabnew" >/tmp/fstab
cat "$fstabnew" >/tmp/fstab rm -f $fstabnew
rm -f $fstabnew lock -u /var/lock/fstab.lck
lock -u /var/lock/fstab.lck
}
} }
libmount_find_token() { libmount_find_token() {

10
package/block-mount/files/fstab.init
View file

@ -66,13 +66,11 @@ start() {
config_load fstab config_load fstab
mkdir -p /var/lock mkdir -p /var/lock
lock -w /var/lock/fstab.lck && { lock /var/lock/fstab.lck
lock /var/lock/fstab.lck [ -e /tmp/fstab ] || {
[ -e /tmp/fstab ] || { echo '# WARNING: this is an auto generated file, please use uci to set defined filesystems' > /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 -u /var/lock/fstab.lck
config_foreach do_swapon swap config_foreach do_swapon swap
config_foreach do_mount mount config_foreach do_mount mount
config_foreach do_swapon swap # do swap a second time so that swap on filesystems is enabled config_foreach do_swapon swap # do swap a second time so that swap on filesystems is enabled