From: rwhitby Date: Sat, 17 May 2008 00:13:05 +0000 (+0000) Subject: base-files: Update /etc/init.d/fstab with new location of swapon and swapoff (they... X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=9dfc3e092d28d1f60741e9af70ea79496b749930;p=openwrt-10.03%2F.git 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 --- diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 1277de452..7fbeb6f33 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 6dd52f23b..b96e0c8a5 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 } }