From d687c1fb1bf283f047c90721909d9d3b1087779a Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sat, 15 May 2021 21:59:40 +0200
Subject: [PATCH] - fsmounter: fix unused options1 for cifs

 Conflicts:
	src/system/fsmounter.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
---
 src/system/fsmounter.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/system/fsmounter.cpp b/src/system/fsmounter.cpp
index ff607c4d4..040ebcdb3 100644
--- a/src/system/fsmounter.cpp
+++ b/src/system/fsmounter.cpp
@@ -228,8 +228,8 @@ CFSMounter::MountRes CFSMounter::mount(const std::string &ip, const std::string
 	{
 		if (fstype == NFS)
 		{
-			options1 = "ro,soft,udp";
-			options2 = "nolock,rsize=8192,wsize=8192";
+			options1 = "soft,udp";
+			options2 = "nolock";
 		}
 		else if (fstype == CIFS)
 		{
@@ -251,8 +251,6 @@ CFSMounter::MountRes CFSMounter::mount(const std::string &ip, const std::string
 		cmd += dir;
 		cmd += ' ';
 		cmd += local_dir;
-		cmd += " -o ";
-		cmd += options1;
 	}
 	else if (fstype == CIFS)
 	{
@@ -266,12 +264,6 @@ CFSMounter::MountRes CFSMounter::mount(const std::string &ip, const std::string
 		cmd += username;
 		cmd += ",password=";
 		cmd += password;
-		//cmd += ",unc=//"; for whats needed?
-		//cmd += ip;
-		//cmd += '/';
-		//cmd += dir;
-		//cmd += ',';
-		//cmd += options1;
 	}
 	else
 	{
@@ -285,11 +277,18 @@ CFSMounter::MountRes CFSMounter::mount(const std::string &ip, const std::string
 		cmd += ip;
 		cmd += ",root=/";
 		cmd += dir;
-		cmd += ',';
+	}
+
+	if (!options1.empty())
+	{
+		if (fstype == NFS)
+			cmd += " -o ";
+		else
+			cmd += ',';
 		cmd += options1;
 	}
 
-	if (options2[0] != '\0')
+	if (!options2.empty())
 	{
 		cmd += ',';
 		cmd += options2;