Skip to content

Commit

Permalink
Merge branch 'BENTO-19' of github.com:juliandunn/bento into BENTO-19
Browse files Browse the repository at this point in the history
Conflicts:
	definitions/.common/vagrant.sh
  • Loading branch information
Julian C. Dunn committed May 22, 2013
2 parents 1531b95 + b506120 commit fda221e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion definitions/.common/vagrant.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
if [ -f /home/vagrant/.vbox_version ]; then
mkdir /tmp/vbox
VER=$(cat /home/vagrant/.vbox_version)
mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox
mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox
sh /tmp/vbox/VBoxLinuxAdditions.run
umount /tmp/vbox
rmdir /tmp/vbox
Expand Down

0 comments on commit fda221e

Please sign in to comment.