Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BENTO-19] Use the VirtualBox ISO that veewee attaches to the machine #50

Merged
merged 5 commits into from
May 22, 2013
Merged

[BENTO-19] Use the VirtualBox ISO that veewee attaches to the machine #50

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b506120
[BENTO-19] Use the VirtualBox ISO that veewee attaches to the machine…
May 17, 2013
545493d
[BENTO-41] Check to see if you're on VirtualBox
lewg May 18, 2013
27e6a21
Merge pull request #52 from juliandunn/centos-5.8-vault
juliandunn May 21, 2013
1531b95
[BENTO-19] Use the VirtualBox ISO that veewee attaches to the machine…
May 17, 2013
fda221e
Merge branch 'BENTO-19' of github.com:juliandunn/bento into BENTO-19
May 22, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions definitions/.common/vagrant.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
#!/bin/bash -eux

mkdir /tmp/vbox
VER=$(cat /home/vagrant/.vbox_version)
wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso
mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox
sh /tmp/vbox/VBoxLinuxAdditions.run
umount /tmp/vbox
rmdir /tmp/vbox
rm *.iso
if [ -f /home/vagrant/.vbox_version ]; then
mkdir /tmp/vbox
VER=$(cat /home/vagrant/.vbox_version)
mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox
sh /tmp/vbox/VBoxLinuxAdditions.run
umount /tmp/vbox
rmdir /tmp/vbox
rm *.iso
fi

mkdir /home/vagrant/.ssh
wget --no-check-certificate \
'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \
'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \
-O /home/vagrant/.ssh/authorized_keys
chown -R vagrant /home/vagrant/.ssh
chmod -R go-rwsx /home/vagrant/.ssh