From 40916ed7ba8283509fd3c78612558391806c37f9 Mon Sep 17 00:00:00 2001 From: "Czarnowski, Przemyslaw" Date: Tue, 9 Nov 2021 12:50:13 +0100 Subject: virtual-media: Fix samba mount with latest kernel Latest changes in kernel introduces changes in mounting parameters. - nolock parameter is no longer used with cifs (before it was ignored) - shortened user version of username is no longer valid (even though it still in the codebase) Tested: Updated mount parameter list made CIFS mount possible again Change-Id: I0f0ecb1f3cdb19144246340e5df12203648648f5 Signed-off-by: Czarnowski, Przemyslaw --- src/smb.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/smb.hpp b/src/smb.hpp index 37e1a41..9e4a2fc 100644 --- a/src/smb.hpp +++ b/src/smb.hpp @@ -23,7 +23,7 @@ class SmbShare { LogMsg(Logger::Debug, "Trying to mount remote : ", remote); - const std::string params = "nolock,sec=ntlmsspi,seal"; + const std::string params = "sec=ntlmsspi,seal"; const std::string perm = rw ? "rw" : "ro"; std::string options = params + "," + perm; std::string credentialsOpt; @@ -31,7 +31,7 @@ class SmbShare if (!credentials) { LogMsg(Logger::Info, "Mounting as Guest"); - credentialsOpt = "guest,user=OpenBmc"; + credentialsOpt = "guest,username=OpenBmc"; } else { @@ -42,7 +42,7 @@ class SmbShare return false; } credentials->escapeCommas(); - credentialsOpt = "user=" + credentials->user() + + credentialsOpt = "username=" + credentials->user() + ",password=" + credentials->password(); } options += "," + credentialsOpt; -- cgit v1.2.3