From: Rod Whitby 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.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=432703aa11b611037d02775a369fe4960b0b5bf5;hp=88f6539789235ad103e59b08b8a8d169f3c1a668 base-files: Update /etc/init.d/fstab with new location of swapon and swapoff (they moved from /sbin to /usr/sbin) SVN-Revision: 11157 --- 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 } }