From 61d2a50a54bcebb40aa476f8c14be8f14db2be7f Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 6 Jun 2016 12:59:51 -0400 Subject: [PATCH] guests/linux: Fix compatibility with dash shell --- plugins/guests/gentoo/cap/configure_networks.rb | 2 +- plugins/guests/linux/cap/mount_nfs.rb | 2 +- plugins/guests/linux/cap/mount_smb_shared_folder.rb | 2 +- plugins/guests/linux/cap/mount_virtualbox_shared_folder.rb | 2 +- plugins/guests/tinycore/cap/mount_nfs.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/guests/gentoo/cap/configure_networks.rb b/plugins/guests/gentoo/cap/configure_networks.rb index 289aa16af..1d4a26b56 100644 --- a/plugins/guests/gentoo/cap/configure_networks.rb +++ b/plugins/guests/gentoo/cap/configure_networks.rb @@ -31,7 +31,7 @@ module VagrantPlugins # Configure the interface comm.sudo("ln -fs /etc/init.d/net.lo /etc/init.d/net.eth#{network[:interface]}") - comm.sudo("/etc/init.d/net.eth#{network[:interface]} stop 2> /dev/null") + comm.sudo("/etc/init.d/net.eth#{network[:interface]} stop") comm.sudo("cat /tmp/vagrant-network-entry >> /etc/conf.d/net") comm.sudo("rm -f /tmp/vagrant-network-entry") comm.sudo("/etc/init.d/net.eth#{network[:interface]} start") diff --git a/plugins/guests/linux/cap/mount_nfs.rb b/plugins/guests/linux/cap/mount_nfs.rb index b823bf36c..83731f563 100644 --- a/plugins/guests/linux/cap/mount_nfs.rb +++ b/plugins/guests/linux/cap/mount_nfs.rb @@ -34,7 +34,7 @@ module VagrantPlugins # Emit a mount event commands << <<-EOH.gsub(/^ {14}/, '') - if command -v /sbin/init &>/dev/null && /sbin/init --version | grep upstart &>/dev/null; then + if command -v /sbin/init && /sbin/init --version | grep upstart; then /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT='#{expanded_guest_path}' fi EOH diff --git a/plugins/guests/linux/cap/mount_smb_shared_folder.rb b/plugins/guests/linux/cap/mount_smb_shared_folder.rb index d85bdf6dc..867a2ddc4 100644 --- a/plugins/guests/linux/cap/mount_smb_shared_folder.rb +++ b/plugins/guests/linux/cap/mount_smb_shared_folder.rb @@ -94,7 +94,7 @@ SCRIPT # Emit an upstart event if we can machine.communicate.sudo <<-SCRIPT -if command -v /sbin/init &>/dev/null && /sbin/init --version | grep upstart &>/dev/null; then +if command -v /sbin/init && /sbin/init --version | grep upstart; then /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT='#{expanded_guest_path}' fi SCRIPT diff --git a/plugins/guests/linux/cap/mount_virtualbox_shared_folder.rb b/plugins/guests/linux/cap/mount_virtualbox_shared_folder.rb index 57fdc207f..1d67c86e3 100644 --- a/plugins/guests/linux/cap/mount_virtualbox_shared_folder.rb +++ b/plugins/guests/linux/cap/mount_virtualbox_shared_folder.rb @@ -81,7 +81,7 @@ module VagrantPlugins # Emit an upstart event if we can machine.communicate.sudo <<-SCRIPT -if command -v /sbin/init &>/dev/null && /sbin/init --version | grep upstart &>/dev/null; then +if command -v /sbin/init && /sbin/init --version | grep upstart; then /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT='#{expanded_guest_path}' fi SCRIPT diff --git a/plugins/guests/tinycore/cap/mount_nfs.rb b/plugins/guests/tinycore/cap/mount_nfs.rb index ccfc1666b..e1cb4a3ce 100644 --- a/plugins/guests/tinycore/cap/mount_nfs.rb +++ b/plugins/guests/tinycore/cap/mount_nfs.rb @@ -34,7 +34,7 @@ module VagrantPlugins # Emit an upstart event if we can machine.communicate.sudo <<-SCRIPT -if command -v /sbin/init &>/dev/null && /sbin/init --version | grep upstart &>/dev/null; then +if command -v /sbin/init && /sbin/init --version | grep upstart; then /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT='#{expanded_guest_path}' fi SCRIPT