haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3638 from jtopper/nfs-sudo-improvements 

Improve use of sudo for NFS export manipulation
This commit is contained in:
Mitchell Hashimoto 2014-05-06 08:47:50 -07:00
parent 62bfefd96f d85fa99ffb
commit 771f951096
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/sudoers/linux Normal file
View File

@ -0,0 +1,8 @@
# These work with Ubuntu - they might need tweaking for other distributions
Cmnd_Alias VAGRANT_EXPORTS_ADD = /usr/bin/tee -a /etc/exports
Cmnd_Alias VAGRANT_NFSD_CHECK = /etc/init.d/nfs-kernel-server status
Cmnd_Alias VAGRANT_NFSD_START = /etc/init.d/nfs-kernel-server start
Cmnd_Alias VAGRANT_NFSD_APPLY = /usr/sbin/exportfs -ar
Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /bin/sed -r -e * d -ibak /etc/exports
%sudo ALL=(root) NOPASSWD: VAGRANT_EXPORTS_ADD, VAGRANT_NFSD_CHECK, VAGRANT_NFSD_START, VAGRANT_NFSD_APPLY, VAGRANT_EXPORTS_REMOVE

5
contrib/sudoers/osx Normal file
View File

@ -0,0 +1,5 @@
Cmnd_Alias VAGRANT_EXPORTS_ADD = /usr/bin/tee -a /etc/exports
Cmnd_Alias VAGRANT_NFSD = /sbin/nfsd restart
Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /usr/bin/sed -E -e /*/ d -ibak /etc/exports
%admin ALL=(root) NOPASSWD: VAGRANT_EXPORTS_ADD, VAGRANT_NFSD, VAGRANT_EXPORTS_REMOVE

2
plugins/hosts/bsd/cap/nfs.rb
View File

@ -105,7 +105,7 @@ module VagrantPlugins
# Output the rendered template into the exports # Output the rendered template into the exports
output.split("\n").each do |line| output.split("\n").each do |line|
line = Vagrant::Util::ShellQuote.escape(line, "'") line = Vagrant::Util::ShellQuote.escape(line, "'")
system("sudo", "-s", "--", "echo '#{line}' >> /etc/exports") system("echo '#{line}' | sudo tee -a /etc/exports >/dev/null")
end end
# We run restart here instead of "update" just in case nfsd # We run restart here instead of "update" just in case nfsd

6
plugins/hosts/linux/cap/nfs.rb
View File

@ -1,4 +1,5 @@
require "vagrant/util" require "vagrant/util"
require "vagrant/util/shell_quote"
require "vagrant/util/retryable" require "vagrant/util/retryable"
module VagrantPlugins module VagrantPlugins
@ -38,9 +39,8 @@ module VagrantPlugins
nfs_cleanup(id) nfs_cleanup(id)
output.split("\n").each do |line| output.split("\n").each do |line|
# This should only ask for administrative permission once, even line = Vagrant::Util::ShellQuote.escape(line, "'")
# though its executed in multiple subshells. system(%Q[echo '#{line}' | sudo tee -a /etc/exports >/dev/null])
system(%Q[sudo su root -c "echo '#{line}' >> /etc/exports"])
end end
if nfs_running?(nfs_check_command) if nfs_running?(nfs_check_command)