Merge pull request #2596 from tmatilai/fix-initctl-test

guests/linux: fix testing if initctl exists
2013-12-06 13:22:03 -08:00 · 2013-12-06 13:22:03 -08:00 · 5b7a4d7f6e
parent b65462faf1 c566465bdc
commit 5b7a4d7f6e
1 changed files with 4 additions and 2 deletions
--- a/plugins/guests/linux/cap/mount_virtualbox_shared_folder.rb
+++ b/plugins/guests/linux/cap/mount_virtualbox_shared_folder.rb
@ -71,8 +71,10 @@ module VagrantPlugins
          machine.communicate.sudo(chown_commands[1]) if exit_status != 0

          # Emit an upstart event if we can
-          machine.communicate.sudo("[ -x /sbin/initctl ] && " +
-            "/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{guestpath}")
+          if machine.communicate.test("test -x /sbin/initctl")
+            machine.communicate.sudo(
+              "/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{guestpath}")
+          end
        end
      end
    end