diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-08-07 00:08:01 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-08-07 00:08:01 +0000 |
| commit | 7c32f4574913017520de356a674b979b83d33f6f (patch) | |
| tree | b56d140dd797185267d1802663ea2344b49709e8 | |
| parent | ae0745e240c74952d5b0870759f49e47d499bfe8 (diff) | |
| download | upstream-7c32f4574913017520de356a674b979b83d33f6f.tar.gz upstream-7c32f4574913017520de356a674b979b83d33f6f.tar.bz2 upstream-7c32f4574913017520de356a674b979b83d33f6f.zip | |
base-files: clean up init.d/fstab and port it to the new config_get
... also remove the unused noauto variable in swapon.
Signed-off-by: Malte S. Stretz <mss@apache.org>
SVN-Revision: 17159
| -rwxr-xr-x | package/base-files/files/etc/init.d/fstab | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/package/base-files/files/etc/init.d/fstab b/package/base-files/files/etc/init.d/fstab index 840350ce19..7d1dffa0bb 100755 --- a/package/base-files/files/etc/init.d/fstab +++ b/package/base-files/files/etc/init.d/fstab @@ -5,15 +5,14 @@ START=20 do_mount() { local cfg="$1" - config_get fstype "$cfg" fstype - fstype="${fstype:-auto}" - config_get options "$cfg" options - options="${options:-rw}" + config_get device "$cfg" device - [ -n "$device" ] || return 0 config_get target "$cfg" target - [ -n "$target" ] || return 0 + [ -n "$device" -a -n "$target" ] || return 0 + mkdir -p $target + config_get fstype "$cfg" fstype 'auto' + config_get options "$cfg" options '-rw' config_get_bool enabled "$cfg" "enabled" '1' [ "$enabled" -eq 0 ] && options="noauto,$options" echo "$device $target $fstype $options 0 0" >> /tmp/fstab @@ -21,32 +20,29 @@ do_mount() { do_swapon() { local cfg="$1" + config_get device "$cfg" device - [ -n "$device" ] || return 0 config_get_bool enabled "$cfg" "enabled" '1' - [ "$enabled" -gt 0 ] && { - echo "$device none swap ${noauto}sw 0 0" >> /tmp/fstab - } + [ -n "$device" -a "$enabled" -gt 0 ] || return 0 + echo "$device none swap sw 0 0" >> /tmp/fstab } do_unmount() { local cfg="$1" + config_get target "$cfg" target - [ -n "$target" ] || return 0 config_get_bool enabled "$cfg" "enabled" '1' - [ "$enabled" -gt 0 ] && { - umount $target - } + [ -n "$target" -a "$enabled" -gt 0 ] || return 0 + umount $target } do_swapoff() { local cfg="$1" + config_get device "$cfg" device - [ -n "$device" ] || return 0 config_get_bool enabled "$cfg" "enabled" '1' - [ "$enabled" -gt 0 ] && type swapoff >/dev/null && { - swapoff $device - } + [ -n "$device" -a "$enabled" -gt 0 ] && type swapoff >/dev/null || return 0 + swapoff $device } start() { |