hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
SVN-Revision: 27226
master
Jo-Philipp Wich 14 years ago
parent e6af77a1c8
commit a434ed2fc6
3 changed files with 21 additions and 27 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      package/block-mount/Makefile
  2. 36
      package/block-mount/files/block.sh
  3. 10
      package/block-mount/files/fstab.init

2
package/block-mount/Makefile
Unescape 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
Unescape 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
Unescape 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

Write Preview
Loading…
Cancel
Save