From 808a98466e282d096e095944e80aa189047ba7cd Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 2 Jul 2011 00:49:28 +0200
Subject: [PATCH] netmount: add options support, enable nolock nfs-mounts per
 default

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/netmount/config/netmount.conf.sample | 2 +-
 packages/network/netmount/scripts/netmount            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/network/netmount/config/netmount.conf.sample b/packages/network/netmount/config/netmount.conf.sample
index 97de6a75bb..3152daa75a 100644
--- a/packages/network/netmount/config/netmount.conf.sample
+++ b/packages/network/netmount/config/netmount.conf.sample
@@ -40,4 +40,4 @@
 # afp | 192.168.1.44/videos | /storage/mount/videos | <username>:<password>
 # 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 | <optional mount options, comma seperated>
diff --git a/packages/network/netmount/scripts/netmount b/packages/network/netmount/scripts/netmount
index b1201c1638..4cf1fbbd77 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.nfs "$SHARE" "$MOUNTPOINT" &
+        mount.nfs "$SHARE" "$MOUNTPOINT" -o nolock,"$OPTIONS" &
         ;;
     esac
   done