From 0c64ab34f331ca9b311b855db6c54ea9916ccea0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 29 Jul 2011 23:57:00 +0200 Subject: [PATCH] netmount: better usage info, mount nfs shares via tcp per default Signed-off-by: Stephan Raue --- .../network/netmount/config/netmount.conf.sample | 13 ++++++++++--- packages/network/netmount/scripts/netmount | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/network/netmount/config/netmount.conf.sample b/packages/network/netmount/config/netmount.conf.sample index bef300ea64..6190c959e7 100644 --- a/packages/network/netmount/config/netmount.conf.sample +++ b/packages/network/netmount/config/netmount.conf.sample @@ -32,12 +32,19 @@ # "afp" for AFP (Apple File Protocol) mounts # - Please use an "|" as delimiter # - 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 and AFP mount +# - be aware of the different syntax for NFS and AFP mounts # - Local mountpoints should only be on /storage # # Examples: +# AFP (Apple File Protocol) mounts, please specify username and password if +# needed. # afp | 192.168.1.44/videos | /storage/mount/videos | : + +# CIFS (Samba/ Windows share) mounts, please specify username and password if +# needed (comma seperated). # 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 | ro,tcp,timeo=600 + +# NFS (Network File System) mounts, please specify additional options if needed +# (comma seperated). Default options are 'tcp' and 'nolock'. +# nfs | 192.168.1.44:/videos | /storage/mount/videos | ro,timeo=600 diff --git a/packages/network/netmount/scripts/netmount b/packages/network/netmount/scripts/netmount index acbb5439c9..3a380f796d 100755 --- a/packages/network/netmount/scripts/netmount +++ b/packages/network/netmount/scripts/netmount @@ -46,7 +46,7 @@ IFS=" mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" & ;; nfs) - mount "$SHARE" "$MOUNTPOINT" -o nolock,"$OPTIONS" & + mount "$SHARE" "$MOUNTPOINT" -o nolock,tcp,"$OPTIONS" & ;; esac done