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

This commit is contained in:
Stephan Raue 2011-05-23 02:28:16 +02:00
commit 7ae9f32164
2 changed files with 5 additions and 4 deletions

View File

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

View File

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