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

[openwrt/svn-archive/archive.git] / package / block-mount / files / block.sh

diff --git a/package/block-mount/files/block.sh b/package/block-mount/files/block.sh
index 72d6c3ab3c77cf637cc8bf7ccb96b2694bebba51..80f74b210b2f0d271340dd188ba7f074e28cc126 100644 (file)
--- 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() {