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 | b6cbcf42cbc925ae0f773cf56ef7824b52cf7bfa (patch) | |
| tree | eee03ea6d09d27a0b4cb5cd781e8169a17fed3ed /package/block-mount/files/block.sh | |
| parent | 191ba94ca27ad224a7202105b9d72d974c981814 (diff) | |
| download | master-187ad058-b6cbcf42cbc925ae0f773cf56ef7824b52cf7bfa.tar.gz master-187ad058-b6cbcf42cbc925ae0f773cf56ef7824b52cf7bfa.tar.bz2 master-187ad058-b6cbcf42cbc925ae0f773cf56ef7824b52cf7bfa.zip | |
[package] block-mount: remove explicit lock waits, solves some potential race conditions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27226 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/block-mount/files/block.sh')
| -rw-r--r-- | package/block-mount/files/block.sh | 36 |
1 files changed, 16 insertions, 20 deletions
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() { |