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

This commit is contained in:
Stephan Raue 2011-05-23 02:27:03 +02:00
commit d9c97e14fa
2 changed files with 5 additions and 4 deletions

View File

@ -26,5 +26,5 @@
wait_for_network
progress "mounting Network shares"
netmount
netmount > /dev/null 2>&1
)&

View File

@ -39,13 +39,14 @@ IFS="
mkdir -p $MOUNTPOINT
case "$SERVICE" in
afp)
mount_afp afp://$OPTIONS@$SHARE "$MOUNTPOINT" > /dev/null 2>&1 &
sleep 1
mount_afp afp://$OPTIONS@$SHARE "$MOUNTPOINT"
;;
cifs)
mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1 &
mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" &
;;
nfs)
mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1 &
mount.nfs "$SHARE" "$MOUNTPOINT" &
;;
esac
done