Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv into openelec-next

This commit is contained in:
Stephan Raue 2011-05-23 14:22:11 +02:00
commit 45e938e2b9

2
packages/network/netmount/scripts/netmount Executable file → Normal file
View File

@ -28,7 +28,7 @@ if [ -f "$NETMOUNT_USERCONF" ]; then
IFS=" IFS="
" "
for i in `cat $NETMOUNT_USERCONF |grep -v "^#"`; do for i in `tr -d '\r' < $NETMOUNT_USERCONF |grep -v "^#"`; do
SERVICE=`echo $i | awk -F\| '{print $1}' | sed 's/^[ \t]*//;s/[ \t]*$//'` SERVICE=`echo $i | awk -F\| '{print $1}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
SHARE=`echo $i | awk -F\| '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//'` SHARE=`echo $i | awk -F\| '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
MOUNTPOINT=`echo $i | awk -F\| '{print $3}' | sed 's/^[ \t]*//;s/[ \t]*$//'` MOUNTPOINT=`echo $i | awk -F\| '{print $3}' | sed 's/^[ \t]*//;s/[ \t]*$//'`