1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 17:15:00 +02:00

[package]: block-mount: Fixed two bugs in fstab.init. /etc/fstab was used where /tmp/fstab should have been, and locking was insufficiently careful and was such that it could result in deadlock when hotplug was in use.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22148 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
cshore 2010-07-12 16:35:39 +00:00
parent 52993b922e
commit 36d52e89e7

View File

@ -41,9 +41,13 @@ do_swapoff() {
start() { start() {
config_load fstab config_load fstab
mkdir -p /var/lock mkdir -p /var/lock
lock /var/lock/fstab.lck lock -w /var/lock/fstab.lck && {
echo '# WARNING: this is an auto generated file, please use uci to set defined filesystems' > /etc/fstab lock /var/lock/fstab.lck
lock -u /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_swapon swap
config_foreach do_mount mount config_foreach do_mount mount
} }