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

Fix testing if initctl exists 

If /sbin/initctl was not found, the command (`false && ...`) returned
non-zero exit code leading to Vagrant throwing an exception.
This commit is contained in:
Teemu Matilainen 2013-12-06 18:12:39 -03:00
parent 17b68f7d50
commit c566465bdc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,8 +71,10 @@ module VagrantPlugins
machine.communicate.sudo(chown_commands[1]) if exit_status != 0 machine.communicate.sudo(chown_commands[1]) if exit_status != 0
# Emit an upstart event if we can # Emit an upstart event if we can
machine.communicate.sudo("[ -x /sbin/initctl ] && " + if machine.communicate.test("test -x /sbin/initctl")
"/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{guestpath}") machine.communicate.sudo(
"/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{guestpath}")
end
end end
end end
end end