mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

fsmounter: fix unused options1 for cifs

Browse Source 
Origin commit data
------------------
Commit: 29d46e058d
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-05-15 (Sat, 15 May 2021)

Origin message was:
------------------
- fsmounter: fix unused options1 for cifs
This commit is contained in:
vanhofen
2021-05-15 21:59:40 +02:00
parent c022e3d25f
commit 18487008cb
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/system/fsmounter.cpp
View File

@@ -178,7 +178,6 @@ bool CFSMounter::isMounted(const std::string &local_dir)
MountInfo mi;
in >> mi.device >> mi.mountPoint >> mi.type;
//NI
if (mi.type == "tmpfs")
continue;
@@ -229,8 +228,8 @@ CFSMounter::MountRes CFSMounter::mount(const std::string &ip, const std::string
{
if (fstype == NFS)
{
options1 = "soft"; //NI
options2 = "nolock"; //NI
options1 = "soft";
options2 = "nolock";
}
else if (fstype == CIFS)
{
@@ -252,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)
{
@@ -267,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
{
@@ -286,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;