cleanup MTD option handling

[openwrt.git] / package / base-files / files / etc / init.d / fstab

diff --git a/package/base-files/files/etc/init.d/fstab b/package/base-files/files/etc/init.d/fstab
index f661b9d..840350c 100755 (executable)
--- a/package/base-files/files/etc/init.d/fstab
+++ b/package/base-files/files/etc/init.d/fstab
@@ -10,9 +10,9 @@ do_mount() {
        config_get options "$cfg" options
        options="${options:-rw}"
        config_get device "$cfg" device
-       [ -n "device" ] || return 0
+       [ -n "$device" ] || return 0
        config_get target "$cfg" target
-       [ -n "target" ] || return 0
+       [ -n "$target" ] || return 0
        mkdir -p $target
        config_get_bool enabled "$cfg" "enabled" '1'
        [ "$enabled" -eq 0 ] && options="noauto,$options"
@@ -22,7 +22,7 @@ do_mount() {
 do_swapon() {
        local cfg="$1"
        config_get device "$cfg" device
-       [ -n "device" ] || return 0
+       [ -n "$device" ] || return 0
        config_get_bool enabled "$cfg" "enabled" '1'
        [ "$enabled" -gt 0 ] && {
                echo "$device   none    swap    ${noauto}sw     0       0" >> /tmp/fstab
@@ -32,7 +32,7 @@ do_swapon() {
 do_unmount() {
        local cfg="$1"
        config_get target "$cfg" target
-       [ -n "target" ] || return 0
+       [ -n "$target" ] || return 0
        config_get_bool enabled "$cfg" "enabled" '1'
        [ "$enabled" -gt 0 ] && {
                umount $target
@@ -42,7 +42,7 @@ do_unmount() {
 do_swapoff() {
        local cfg="$1"
        config_get device "$cfg" device
-       [ -n "device" ] || return 0
+       [ -n "$device" ] || return 0
        config_get_bool enabled "$cfg" "enabled" '1'
        [ "$enabled" -gt 0 ] && type swapoff >/dev/null && {
                swapoff $device
@@ -55,12 +55,13 @@ start() {
        config_foreach do_mount mount
        config_foreach do_swapon swap
        mount -a
-       swapon -a
+       [ -x /sbin/swapon ] && swapon -a
 }
 
 stop() {
        config_load fstab
        config_foreach do_unmount mount
        config_foreach do_swapoff swap
+       [ -x /sbin/swapoff ] && swapoff -a
 }