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

Merge pull request #7270 from lpenz/nfspager 

Do not let NFS systemctl status use a pager
This commit is contained in:
Seth Vargo 2016-06-06 19:11:41 -04:00
parent a21e154efd d29acc8982
commit 01e91882f0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/sudoers/linux-fedora
View File

@ -1,5 +1,5 @@
Cmnd_Alias VAGRANT_EXPORTS_ADD = /usr/bin/tee -a /etc/exports Cmnd_Alias VAGRANT_EXPORTS_ADD = /usr/bin/tee -a /etc/exports
Cmnd_Alias VAGRANT_NFSD_CHECK = /usr/bin/systemctl status nfs-server.service Cmnd_Alias VAGRANT_NFSD_CHECK = /usr/bin/systemctl status --no-pager nfs-server.service
Cmnd_Alias VAGRANT_NFSD_START = /usr/bin/systemctl start nfs-server.service Cmnd_Alias VAGRANT_NFSD_START = /usr/bin/systemctl start nfs-server.service
Cmnd_Alias VAGRANT_NFSD_APPLY = /usr/sbin/exportfs -ar Cmnd_Alias VAGRANT_NFSD_APPLY = /usr/sbin/exportfs -ar
Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /bin/sed -r -e * d -ibak /*/exports Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /bin/sed -r -e * d -ibak /*/exports

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

@ -4,7 +4,7 @@ module VagrantPlugins
class NFS class NFS
def self.nfs_check_command(env) def self.nfs_check_command(env)
if systemd? if systemd?
return "/usr/sbin/systemctl status nfs-server.service" return "/usr/sbin/systemctl status --no-pager nfs-server.service"
else else
return "/etc/rc.d/nfs-server status" return "/etc/rc.d/nfs-server status"
end end

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

@ -7,7 +7,7 @@ module VagrantPlugins
class NFS class NFS
def self.nfs_check_command(env) def self.nfs_check_command(env)
if systemd? if systemd?
return "#{systemctl_path} status nfs-server.service" return "#{systemctl_path} status --no-pager nfs-server.service"
else else
return "/etc/init.d/nfs status" return "/etc/init.d/nfs status"
end end