From ca8923835ae63e1b3554b779750d02fffb9ad427 Mon Sep 17 00:00:00 2001 From: Francesco Date: Mon, 8 Jun 2015 04:13:23 +0100 Subject: [PATCH 1/2] Use the extended password parameter, more compatible --- plugins/guests/linux/cap/mount_smb_shared_folder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/guests/linux/cap/mount_smb_shared_folder.rb b/plugins/guests/linux/cap/mount_smb_shared_folder.rb index ca14cf148..d380d2ca3 100644 --- a/plugins/guests/linux/cap/mount_smb_shared_folder.rb +++ b/plugins/guests/linux/cap/mount_smb_shared_folder.rb @@ -33,7 +33,7 @@ module VagrantPlugins options[:mount_options] ||= [] options[:mount_options] << "sec=ntlm" options[:mount_options] << "username=#{username}" - options[:mount_options] << "pass=#{smb_password}" + options[:mount_options] << "password=#{smb_password}" options[:mount_options] << "domain=#{domain}" if domain # First mount command uses getent to get the group From c66df8cd2cbd445bd7435db63c311254a35a4728 Mon Sep 17 00:00:00 2001 From: Francesco Date: Mon, 8 Jun 2015 09:48:21 +0100 Subject: [PATCH 2/2] Updating the test to see the changes to the mount pass parameter --- .../plugins/guests/linux/cap/mount_shared_folder_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb b/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb index 4d591e7fb..047d05e82 100644 --- a/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb +++ b/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb @@ -18,7 +18,7 @@ describe "VagrantPlugins::GuestLinux::Cap::MountSharedFolder" do describe ".mount_shared_folder" do describe "with a domain" do - let(:mount_command) { "mount -t cifs -o uid=`id -u `,gid=`getent group | cut -d: -f3`,sec=ntlm,username=user,pass=pass,domain=domain //host/name " } + let(:mount_command) { "mount -t cifs -o uid=`id -u `,gid=`getent group | cut -d: -f3`,sec=ntlm,username=user,password=pass,domain=domain //host/name " } before do communicator.expect_command mount_command communicator.stub_command mount_command, exit_code: 0 @@ -29,7 +29,7 @@ describe "VagrantPlugins::GuestLinux::Cap::MountSharedFolder" do end end describe "without a domain" do - let(:mount_command) { "mount -t cifs -o uid=`id -u `,gid=`getent group | cut -d: -f3`,sec=ntlm,username=user,pass=pass //host/name " } + let(:mount_command) { "mount -t cifs -o uid=`id -u `,gid=`getent group | cut -d: -f3`,sec=ntlm,username=user,password=pass //host/name " } before do communicator.expect_command mount_command communicator.stub_command mount_command, exit_code: 0 @@ -41,4 +41,4 @@ describe "VagrantPlugins::GuestLinux::Cap::MountSharedFolder" do end end end -end \ No newline at end of file +end