projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
b96e0c8
..
840350c
100755
(executable)
--- a/
package/base-files/files/etc/init.d/fstab
+++ b/
package/base-files/files/etc/init.d/fstab
@@
-10,55
+10,58
@@
do_mount() {
config_get options "$cfg" options
options="${options:-rw}"
config_get device "$cfg" device
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
config_get target "$cfg" target
- [ -n "target" ] || return 0
+ [ -n "
$
target" ] || return 0
mkdir -p $target
config_get_bool enabled "$cfg" "enabled" '1'
mkdir -p $target
config_get_bool enabled "$cfg" "enabled" '1'
- [ "$enabled" -gt 0 ] && {
- /bin/mount -t $fstype -o $options $device $target
- }
+ [ "$enabled" -eq 0 ] && options="noauto,$options"
+ echo "$device $target $fstype $options 0 0" >> /tmp/fstab
}
do_swapon() {
local cfg="$1"
config_get device "$cfg" device
}
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'
config_get_bool enabled "$cfg" "enabled" '1'
- [ "$enabled" -gt 0 ] &&
[ -x /usr/sbin/swapon ] &&
{
- /usr/sbin/swapon $device
+ [ "$enabled" -gt 0 ] && {
+ echo "$device none swap ${noauto}sw 0 0" >> /tmp/fstab
}
}
do_unmount() {
local cfg="$1"
config_get target "$cfg" target
}
}
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 ] && {
config_get_bool enabled "$cfg" "enabled" '1'
[ "$enabled" -gt 0 ] && {
- /bin/umount $target
+ umount $target
}
}
do_swapoff() {
local cfg="$1"
config_get device "$cfg" device
}
}
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'
config_get_bool enabled "$cfg" "enabled" '1'
- [ "$enabled" -gt 0 ] &&
[ -x /usr/sbin/swapoff ]
&& {
-
/usr/sbin/
swapoff $device
+ [ "$enabled" -gt 0 ] &&
type swapoff >/dev/null
&& {
+
swapoff $device
}
}
start() {
config_load fstab
}
}
start() {
config_load fstab
+ echo '# WARNING: this is an auto generated file, please use uci to set static filesystems' > /tmp/fstab
config_foreach do_mount mount
config_foreach do_swapon swap
config_foreach do_mount mount
config_foreach do_swapon swap
+ mount -a
+ [ -x /sbin/swapon ] && swapon -a
}
stop() {
config_load fstab
config_foreach do_unmount mount
config_foreach do_swapoff swap
}
stop() {
config_load fstab
config_foreach do_unmount mount
config_foreach do_swapoff swap
+ [ -x /sbin/swapoff ] && swapoff -a
}
}
This page took
0.027645 seconds
and
4
git commands to generate.