netmount: add support for busybox's NFS and CIFS mounts, add support for adding options to NFS mounts

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/network/netmount/config/netmount.conf.sample

@@ -30,12 +30,12 @@
 #
 # - "service" can be "nfs" for NFS mounts or "cifs" for CIFS (Samba) mounts
 # - Please use an "|" as delimiter
+# - Please use an "," as delimiter for mountoptions
 # - Don't use spaces in usernames, passwords and options
-# - for NFS mounts there is no support for options
 # - be aware of the different syntax for NFS shares
 # - Local mountpoints should only be on /storage
 #
 # Examples:
 # cifs | //192.168.1.44/videos | /storage/mount/videos | username=user,pass=secret
 # cifs | //192.168.1.44/tv shows | /storage/mount/tvshows | username=user,pass=secret
-# nfs | 192.168.1.44:/videos | /storage/mount/videos
+# nfs | 192.168.1.44:/videos | /storage/mount/videos | rw

packages/network/netmount/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="cifs-utils nfs-utils sshfs-fuse connman"
+PKG_DEPENDS="sshfs-fuse connman"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"

packages/network/netmount/scripts/netmount

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