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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vagrantfile: Changed to 32 bit Debian box #52

Merged
merged 4 commits into from Sep 2, 2015
Merged

Vagrantfile: Changed to 32 bit Debian box #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99484d8
Use an x86 box instead.
perlun Aug 31, 2015
17f0fe9
Changed to always use the puphpet/debian75-x32 box.
perlun Sep 2, 2015
74d21f9
Fixed to work now that we are using a 32-bit image.
perlun Sep 2, 2015
9e69611
Let's play nice with x64 also.
perlun Sep 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Rakefile
View file
Open in desktop
Expand Up @@ -39,12 +39,13 @@ end

desc 'Builds a bootable ISO image with the kernel, servers and programs.'
task :iso_image do

FileUtils.mkdir_p "#{INSTALL_ROOT}/boot/grub"
FileUtils.cp 'menu.lst', "#{INSTALL_ROOT}/boot/grub"

# I suspect this is actually an x86 binary, even though it resides in a folder that seems to indicate the opposite.
FileUtils.cp '/usr/lib/grub/x86_64-pc/stage2_eltorito', "#{INSTALL_ROOT}/boot/grub"
eltorito_file = '/usr/lib/grub/i386-pc/stage2_eltorito'
eltorito_file = '/usr/lib/grub/x86_64-pc/stage2_eltorito' unless File.exist? eltorito_file

FileUtils.cp eltorito_file, "#{INSTALL_ROOT}/boot/grub"

print 'Creating ISO image...'.cyan.bold
sh "genisoimage \
Expand Down Expand Up @@ -85,4 +86,3 @@ end
task :servers do |folder|
sh "cd #{folder} && rake"
end

8 changes: 1 addition & 7 deletions Vagrantfile
View file
Open in desktop
@@ -1,11 +1,5 @@
Vagrant.configure(2) do |config|
config.vm.provider :parallels do |vb, override|
override.vm.box = 'puphpet/debian75-x64'
end

config.vm.provider :virtualbox do |vb, override|
config.vm.box = 'chef/debian-7.8'
end
config.vm.box = 'puphpet/debian75-x32'

config.vm.provision 'shell', inline: <<-SHELL
set -e
Expand Down