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

Merge pull request #6537 from mitchellh/sethvargo/emit_upstart 

Fix upstart detection and event emit
This commit is contained in:
Seth Vargo 2015-11-18 16:26:06 -08:00
parent 1a7937ed50 82f620ed13
commit ecf6087a90
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/guests/linux/cap/mount_nfs.rb
View File

@ -33,10 +33,11 @@ module VagrantPlugins
end end
# Emit an upstart event if we can # Emit an upstart event if we can
if machine.communicate.test("test -x /sbin/initctl && test 'upstart' = $(basename $(sudo readlink /proc/1/exe))") machine.communicate.sudo <<-SCRIPT
machine.communicate.sudo( if command -v /sbin/init &>/dev/null && /sbin/init --version | grep upstart &>/dev/null; then
"/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{expanded_guest_path}") /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT='#{expanded_guest_path}'
end fi
SCRIPT
end end
end end
end end

9
plugins/guests/linux/cap/mount_smb_shared_folder.rb
View File

@ -86,10 +86,11 @@ module VagrantPlugins
end end
# Emit an upstart event if we can # Emit an upstart event if we can
if machine.communicate.test("test -x /sbin/initctl && test 'upstart' = $(basename $(sudo readlink /proc/1/exe))") machine.communicate.sudo <<-SCRIPT
machine.communicate.sudo( if command -v /sbin/init &>/dev/null && /sbin/init --version | grep upstart &>/dev/null; then
"/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{expanded_guest_path}") /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT='#{expanded_guest_path}'
end fi
SCRIPT
end end
end end
end end

9
plugins/guests/linux/cap/mount_virtualbox_shared_folder.rb
View File

@ -80,10 +80,11 @@ module VagrantPlugins
end end
# Emit an upstart event if we can # Emit an upstart event if we can
if machine.communicate.test("test -x /sbin/initctl && test 'upstart' = $(basename $(sudo readlink /proc/1/exe))") machine.communicate.sudo <<-SCRIPT
machine.communicate.sudo( if command -v /sbin/init &>/dev/null && /sbin/init --version | grep upstart &>/dev/null; then
"/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{expanded_guest_path}") /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT='#{expanded_guest_path}'
end fi
SCRIPT
end end
def self.unmount_virtualbox_shared_folder(machine, guestpath, options) def self.unmount_virtualbox_shared_folder(machine, guestpath, options)