Merge pull request #7270 from lpenz/nfspager

Do not let NFS systemctl status use a pager
hashicorp · Jun 6, 2016 · 01e9188 · 01e9188
2 parents a21e154 + d29acc8
commit 01e9188
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/contrib/sudoers/linux-fedora b/contrib/sudoers/linux-fedora
@@ -1,5 +1,5 @@
 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_APPLY = /usr/sbin/exportfs -ar
 Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /bin/sed -r -e * d -ibak /*/exports

diff --git a/plugins/hosts/arch/cap/nfs.rb b/plugins/hosts/arch/cap/nfs.rb
@@ -4,7 +4,7 @@ module Cap
       class NFS
         def self.nfs_check_command(env)
           if systemd?
-            return "/usr/sbin/systemctl status nfs-server.service"
+            return "/usr/sbin/systemctl status --no-pager nfs-server.service"
           else
             return "/etc/rc.d/nfs-server status"
           end

diff --git a/plugins/hosts/gentoo/cap/nfs.rb b/plugins/hosts/gentoo/cap/nfs.rb
@@ -7,7 +7,7 @@ module Cap
       class NFS
         def self.nfs_check_command(env)
           if systemd?
-            return "#{systemctl_path} status nfs-server.service"
+            return "#{systemctl_path} status --no-pager nfs-server.service"
           else
             return "/etc/init.d/nfs status"
           end