aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2008-05-17 00:13:05 +0000
committerRod Whitby <rod@whitby.id.au>2008-05-17 00:13:05 +0000
commit9bdc6b6c6011a487f14b5cbc26b95b808040619c (patch)
treef452c01f444522976445f09bac46fe56900ccb8f
parent3bf5361998a5fba7655e561d5a64539f5f4f716b (diff)
downloadupstream-9bdc6b6c6011a487f14b5cbc26b95b808040619c.tar.gz
upstream-9bdc6b6c6011a487f14b5cbc26b95b808040619c.tar.bz2
upstream-9bdc6b6c6011a487f14b5cbc26b95b808040619c.zip
base-files: Update /etc/init.d/fstab with new location of swapon and swapoff (they moved from /sbin to /usr/sbin)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11157 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/etc/init.d/fstab8
2 files changed, 5 insertions, 5 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1277de452e..7fbeb6f330 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files
-PKG_RELEASE:=12
+PKG_RELEASE:=13
PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
diff --git a/package/base-files/files/etc/init.d/fstab b/package/base-files/files/etc/init.d/fstab
index 6dd52f23bb..b96e0c8a54 100755
--- a/package/base-files/files/etc/init.d/fstab
+++ b/package/base-files/files/etc/init.d/fstab
@@ -25,8 +25,8 @@ do_swapon() {
config_get device "$cfg" device
[ -n "device" ] || return 0
config_get_bool enabled "$cfg" "enabled" '1'
- [ "$enabled" -gt 0 ] && [ -x /sbin/swapon ] && {
- /sbin/swapon $device
+ [ "$enabled" -gt 0 ] && [ -x /usr/sbin/swapon ] && {
+ /usr/sbin/swapon $device
}
}
@@ -45,8 +45,8 @@ do_swapoff() {
config_get device "$cfg" device
[ -n "device" ] || return 0
config_get_bool enabled "$cfg" "enabled" '1'
- [ "$enabled" -gt 0 ] && [ -x /sbin/swapoff ] && {
- /sbin/swapoff $device
+ [ "$enabled" -gt 0 ] && [ -x /usr/sbin/swapoff ] && {
+ /usr/sbin/swapoff $device
}
}