From d6a4d512e42ca2500180f4d30589f5f07827ab52 Mon Sep 17 00:00:00 2001 From: Wintemrute Date: Wed, 8 Dec 2010 17:29:15 +0100 Subject: [PATCH] Fixing netmount. --- packages/network/netmount/config/netmount.conf.sample | 4 ++-- packages/network/netmount/init.network/43_netmount | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/network/netmount/config/netmount.conf.sample b/packages/network/netmount/config/netmount.conf.sample index 59b2affdc3..926e3b8f22 100644 --- a/packages/network/netmount/config/netmount.conf.sample +++ b/packages/network/netmount/config/netmount.conf.sample @@ -17,6 +17,6 @@ # - Local mountpoints should only be on /storage # # Examples: -# cifs | //192.168.1.44/videos | /storage/mount/videos | username=user,password=secret -# cifs | //192.168.1.44/tv shows | /storage/mount/tvshows | username=user,password=secret +# 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 diff --git a/packages/network/netmount/init.network/43_netmount b/packages/network/netmount/init.network/43_netmount index abdc996795..36033fcd69 100755 --- a/packages/network/netmount/init.network/43_netmount +++ b/packages/network/netmount/init.network/43_netmount @@ -44,7 +44,7 @@ IFS=" case "$SERVICE" in cifs|smb|samba) - mount.cifs "$SHARE" "$MOUNTPOINT" "$OPTIONS" > /dev/null 2>&1 + mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1 ;; nfs) mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1