qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-01-27 14:01:05 +02:00
Code

base-files: clean up init.d/fstab and port it to the new config_get

Browse Source 
... also remove the unused noauto variable in swapon.

Signed-off-by: Malte S. Stretz <mss@apache.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17159 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2009-08-07 00:08:01 +00:00
parent 770318bd49
commit e4895b7178
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
package/base-files/files/etc/init.d/fstab
View File

@ -5,15 +5,14 @@ START=20
do_mount() { do_mount() {
local cfg="$1" local cfg="$1"
config_get fstype "$cfg" fstype
fstype="${fstype:-auto}"
config_get options "$cfg" options
options="${options:-rw}"
config_get device "$cfg" device config_get device "$cfg" device
[ -n "$device" ] || return 0
config_get target "$cfg" target config_get target "$cfg" target
[ -n "$target" ] || return 0 [ -n "$device" -a -n "$target" ] || return 0
mkdir -p $target mkdir -p $target
config_get fstype "$cfg" fstype 'auto'
config_get options "$cfg" options '-rw'
config_get_bool enabled "$cfg" "enabled" '1' config_get_bool enabled "$cfg" "enabled" '1'
[ "$enabled" -eq 0 ] && options="noauto,$options" [ "$enabled" -eq 0 ] && options="noauto,$options"
echo "$device $target $fstype $options 0 0" >> /tmp/fstab echo "$device $target $fstype $options 0 0" >> /tmp/fstab
@ -21,32 +20,29 @@ do_mount() {
do_swapon() { do_swapon() {
local cfg="$1" local cfg="$1"
config_get device "$cfg" device config_get device "$cfg" device
[ -n "$device" ] || return 0
config_get_bool enabled "$cfg" "enabled" '1' config_get_bool enabled "$cfg" "enabled" '1'
[ "$enabled" -gt 0 ] && { [ -n "$device" -a "$enabled" -gt 0 ] || return 0
echo "$device none swap ${noauto}sw 0 0" >> /tmp/fstab echo "$device none swap sw 0 0" >> /tmp/fstab
}
} }
do_unmount() { do_unmount() {
local cfg="$1" local cfg="$1"
config_get target "$cfg" target config_get target "$cfg" target
[ -n "$target" ] || return 0
config_get_bool enabled "$cfg" "enabled" '1' config_get_bool enabled "$cfg" "enabled" '1'
[ "$enabled" -gt 0 ] && { [ -n "$target" -a "$enabled" -gt 0 ] || return 0
umount $target umount $target
}
} }
do_swapoff() { do_swapoff() {
local cfg="$1" local cfg="$1"
config_get device "$cfg" device config_get device "$cfg" device
[ -n "$device" ] || return 0
config_get_bool enabled "$cfg" "enabled" '1' config_get_bool enabled "$cfg" "enabled" '1'
[ "$enabled" -gt 0 ] && type swapoff >/dev/null && { [ -n "$device" -a "$enabled" -gt 0 ] && type swapoff >/dev/null || return 0
swapoff $device swapoff $device
}
} }
start() { start() {