mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fsmounter: fix unused options1 for cifs

Browse Source 
Conflicts:
	src/system/fsmounter.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-05-15 21:59:40 +02:00
committed by Thilo Graf
parent 2f20d8d670
commit d687c1fb1b
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/system/fsmounter.cpp
View File

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