From 0a1c669ec13cd3656c2e1124a4a83f2324f02bec Mon Sep 17 00:00:00 2001
From: Matteo Croce <rootkit85@yahoo.it>
Date: Mon, 19 May 2008 22:08:46 +0000
Subject: [PATCH] fix some wrong paths

SVN-Revision: 11217
---
 package/base-files/files/etc/init.d/fstab | 12 +++++-----
 package/util-linux-ng/Makefile            | 29 +++++++++++------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/package/base-files/files/etc/init.d/fstab b/package/base-files/files/etc/init.d/fstab
index b96e0c8a548..2d2976ffcbe 100755
--- a/package/base-files/files/etc/init.d/fstab
+++ b/package/base-files/files/etc/init.d/fstab
@@ -16,7 +16,7 @@ do_mount() {
 	mkdir -p $target
 	config_get_bool enabled "$cfg" "enabled" '1'
 	[ "$enabled" -gt 0 ] && {
-	  /bin/mount -t $fstype -o $options $device $target 
+		mount -t $fstype -o $options $device $target
 	}
 }
 
@@ -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 /usr/sbin/swapon ] && {
-	  /usr/sbin/swapon $device
+	[ "$enabled" -gt 0 ] && type swapon >/dev/null && {
+		swapon $device
 	}
 }
 
@@ -36,7 +36,7 @@ do_unmount() {
 	[ -n "target" ] || return 0
 	config_get_bool enabled "$cfg" "enabled" '1'
 	[ "$enabled" -gt 0 ] && {
-	  /bin/umount $target 
+		umount $target
 	}
 }
 	
@@ -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 /usr/sbin/swapoff ] && {
-	  /usr/sbin/swapoff $device
+	[ "$enabled" -gt 0 ] && type swapoff >/dev/null && {
+		swapoff $device
 	}
 }
 
diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index e15d5550865..f6593f73550 100644
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -72,7 +72,7 @@ $(call Package/util-linux/Default)
 endef
 
 define Package/swap-utils/description
- This package contains a collection of tools for managing swap space: 
+ This package contains a collection of tools for managing swap space:
  - mkswap
  - swapon
  - swapoff
@@ -95,35 +95,34 @@ define Build/Compile
 endef
 
 define Package/fdisk/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/fdisk $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/fdisk $(1)/sbin/
 endef
 
 define Package/cfdisk/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/cfdisk $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/cfdisk $(1)/sbin/
 endef
 
 define Package/losetup/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/losetup $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/losetup $(1)/sbin/
 endef
 
 define Package/mount-utils/install
-	$(INSTALL_DIR) $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/{u,}mount $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/{u,}mount $(1)/bin
 endef
 
 define Package/swap-utils/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/mkswap $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/swapon $(1)/usr/sbin/
-	ln -sf swapon $(1)/usr/sbin/swapoff
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/mkswap $(PKG_BUILD_DIR)/mount/swapon $(1)/sbin/
+	ln -sf swapon $(1)/sbin/swapoff
 endef
 
 define Package/hwclock/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/sbin/
 endef
 
 $(eval $(call BuildPackage,fdisk))