From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 28 Sep 2009 15:56:08 +0000 (+0000)
Subject: usb-storage: allow mounting more than a single device, use /etc/fstab when appropriat... 
X-Git-Tag: 8.09.2~27
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=1fc1023cb7f0ae08a8125e5d3bc5617ced3da573;p=openwrt%2Fsvn-archive%2Fopenwrt.git

usb-storage: allow mounting more than a single device, use /etc/fstab when appropriate (closes: #5712)

SVN-Revision: 17786
---

diff --git a/package/base-files/files/sbin/usb-storage b/package/base-files/files/sbin/usb-storage
index e02efa8115..5213a24aaa 100755
--- a/package/base-files/files/sbin/usb-storage
+++ b/package/base-files/files/sbin/usb-storage
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 logger "usb device is mass storage"
 i=0
 while [ $i -le 10 ]; do
@@ -13,9 +13,16 @@ while [ $i -le 10 ]; do
 				sleep 2
 				cd $disc
 				for node in `find . -name "sd*" | cut -d "/" -f2`; do
-					echo "mounting /dev/${node} on /mnt/usbdrive"
-					mkdir -p /mnt/usbdrive
-					mount /dev/${node} /mnt/usbdrive
+					dev="/dev/${node}"
+					if [ -e /etc/fstab ] && grep -q "^${dev}" /etc/fstab; then
+						dir=`cat /etc/fstab | grep "^${dev}" | awk '{ print $2; }'`
+					else
+						dir="/mnt/${node}"
+					fi
+					logger "mounting ${dev} on ${dir}" 
+					mkdir -p ${dir}
+					mount ${dev} ${dir}
+					ln -nsf ${dir} /mnt/usbdrive
 					i=20	
 				done
 			done