diff --git a/packages/network/netmount/config/netmount.conf.sample b/packages/network/netmount/config/netmount.conf.sample index d11f0a4c9e..d475827566 100644 --- a/packages/network/netmount/config/netmount.conf.sample +++ b/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 | rw +# nfs | 192.168.1.44:/videos | /storage/mount/videos diff --git a/packages/network/netmount/meta b/packages/network/netmount/meta index f28a5ba08b..b03d47fae3 100644 --- a/packages/network/netmount/meta +++ b/packages/network/netmount/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS="sshfs-fuse connman" +PKG_DEPENDS="cifs-utils nfs-utils sshfs-fuse connman" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" PKG_SECTION="tools" diff --git a/packages/network/netmount/scripts/netmount b/packages/network/netmount/scripts/netmount index bcf2b9da89..49487d93da 100755 --- a/packages/network/netmount/scripts/netmount +++ b/packages/network/netmount/scripts/netmount @@ -39,10 +39,10 @@ IFS=" mkdir -p $MOUNTPOINT case "$SERVICE" in cifs) - mount "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1 & + mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1 & ;; nfs) - mount "$SHARE" "$MOUNTPOINT" -o nolock,"$OPTIONS" > /dev/null 2>&1 & + mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1 & ;; esac done