Skip to content

Fedora 18 and spelling error fixes #454

Merged
merged 7 commits into from Dec 20, 2012
View
2 doc/vagrant.md
@@ -3,7 +3,7 @@ Let's define a Ubuntu 10.10 server i386 basebox called myunbuntubox
this is essentially making a copy based on the templates provided above.
$ veewee vbox define 'myubuntubox' 'ubuntu-10.10-server-i386'
- The basebox 'myubuntubox' has been succesfully created from the template ''ubuntu-10.10-server-i386'
+ The basebox 'myubuntubox' has been successfully created from the template ''ubuntu-10.10-server-i386'
You can now edit the definition files stored in definitions/myubuntubox
or build the box with:
veewee vbox build 'myubuntubox'
View
4 lib/veewee/command/fusion.rb
@@ -93,7 +93,7 @@ def define(definition_name, template_name)
venv=Veewee::Environment.new(options)
venv.ui=env.ui
venv.definitions.define(definition_name,template_name,options)
- env.ui.info "The basebox '#{definition_name}' has been succesfully created from the template '#{template_name}'"
+ env.ui.info "The basebox '#{definition_name}' has been successfully created from the template '#{template_name}'"
env.ui.info "You can now edit the definition files stored in definitions/#{definition_name} or build the box with:"
env.ui.info "veewee fusion build '#{definition_name}'"
end
@@ -106,7 +106,7 @@ def undefine(definition_name)
venv=Veewee::Environment.new(options)
venv.ui=env.ui
venv.definitions.undefine(definition_name,options)
- env.ui.info "Definition #{definition_name} succesfully removed",:prefix => false
+ env.ui.info "Definition #{definition_name} successfully removed",:prefix => false
rescue Error => ex
env.ui.error "#{ex}" , :prefix => false
exit -1
View
2 lib/veewee/command/kvm.rb
@@ -60,7 +60,7 @@ def define(definition_name, template_name)
venv=Veewee::Environment.new(options)
venv.ui=env.ui
venv.definitions.define(definition_name,template_name,options)
- env.ui.info "The basebox '#{definition_name}' has been succesfully created from the template '#{template_name}'"
+ env.ui.info "The basebox '#{definition_name}' has been successfully created from the template '#{template_name}'"
env.ui.info "You can now edit the definition files stored in definitions/#{definition_name} or build the box with:"
env.ui.info "veewee kvm build '#{definition_name}'"
end
View
4 lib/veewee/command/parallels.rb
@@ -57,7 +57,7 @@ def define(definition_name, template_name)
venv=Veewee::Environment.new(options)
venv.ui=env.ui
venv.definitions.define(definition_name,template_name,options)
- env.ui.info "The basebox '#{definition_name}' has been succesfully created from the template '#{template_name}'"
+ env.ui.info "The basebox '#{definition_name}' has been successfully created from the template '#{template_name}'"
env.ui.info "You can now edit the definition files stored in definitions/#{definition_name} or build the box with:"
env.ui.info "veewee parallels build '#{definition_name}'"
end
@@ -70,7 +70,7 @@ def undefine(definition_name)
venv=Veewee::Environment.new(options)
venv.ui=env.ui
venv.definitions.undefine(definition_name,options)
- env.ui.info "Definition #{definition_name} succesfully removed",:prefix => false
+ env.ui.info "Definition #{definition_name} successfully removed",:prefix => false
rescue Error => ex
env.ui.error "#{ex}" , :prefix => false
exit -1
View
2 lib/veewee/command/vagrant/define.rb
@@ -33,7 +33,7 @@ def execute
definition_name=argv[0]
template_name=argv[1]
venv.definitions.define(definition_name,template_name,options)
- venv.ui.info "The basebox '#{definition_name}' has been succesfully created from the template '#{template_name}'"
+ venv.ui.info "The basebox '#{definition_name}' has been successfully created from the template '#{template_name}'"
venv.ui.info "You can now edit the definition files stored in definitions/#{definition_name} or build the box with:"
venv.ui.info "vagrant basebox build '#{definition_name}'"
rescue Veewee::Error => ex
View
2 lib/veewee/command/vagrant/undefine.rb
@@ -28,7 +28,7 @@ def execute
venv.ui=@env.ui
definition_name=argv[0]
venv.definitions.undefine(definition_name,options)
- venv.ui.info("Definition '#{definition_name}' succesfully removed",:prefix => false)
+ venv.ui.info("Definition '#{definition_name}' successfully removed",:prefix => false)
rescue Veewee::Error => ex
venv.ui.error(ex,:prefix => false)
exit -1
View
4 lib/veewee/command/vbox.rb
@@ -79,7 +79,7 @@ def define(definition_name, template_name)
venv=Veewee::Environment.new(options)
venv.ui=env.ui
venv.definitions.define(definition_name,template_name,options)
- env.ui.info "The basebox '#{definition_name}' has been succesfully created from the template '#{template_name}'"
+ env.ui.info "The basebox '#{definition_name}' has been successfully created from the template '#{template_name}'"
env.ui.info "You can now edit the definition files stored in definitions/#{definition_name} or build the box with:"
env.ui.info "veewee vbox build '#{definition_name}'"
rescue Error => ex
@@ -96,7 +96,7 @@ def undefine(definition_name)
venv=Veewee::Environment.new(options)
venv.ui=env.ui
venv.definitions.undefine(definition_name,options)
- env.ui.info "Definition #{definition_name} succesfully removed" , :prefix => false
+ env.ui.info "Definition #{definition_name} successfully removed" , :prefix => false
rescue Error => ex
env.ui.error("#{ex}",:prefix => false)
exit -1
View
2 lib/veewee/provider/core/box/build.rb
@@ -86,7 +86,7 @@ def build(options={})
self.handle_postinstall(options)
- ui.success "The box #{name} was build succesfully!"
+ ui.success "The box #{name} was build successfully!"
ui.info "You can now login to the box with:"
if (definition.winrm_user && definition.winrm_password)
env.ui.info winrm_command_string
View
12 templates/Fedora-18-i386/definition.rb
@@ -1,17 +1,17 @@
Veewee::Session.declare({
- # Minimum RAM requirement for installation is 768MB.
- :cpu_count => '1', :memory_size=> '768',
+ # Minimum RAM requirement for installation is 512MB.
+ :cpu_count => '1', :memory_size=> '512',
:disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :hwvirtext => 'on',
:os_type_id => 'Fedora',
- :iso_file => "Fedora-18-Beta-TC9-i386-DVD.iso",
- :iso_src => "http://dl.fedoraproject.org/pub/alt/stage/18-Beta-TC9/Fedora/i386/iso/Fedora-18-Beta-TC9-i386-DVD.iso",
- :iso_md5 => "a673a3c4fa6fd731a7caeef75e3ca729",
+ :iso_file => "Fedora-18-Beta-i386-DVD.iso",
+ :iso_src => "http://download.fedoraproject.org/pub/fedora/linux/releases/test/18-Beta/Fedora/i386/iso/Fedora-18-Beta-i386-DVD.iso",
+ :iso_md5 => "fe79303aec5231df82ebe4a30e0dc83c",
:iso_download_timeout => 1000,
:boot_wait => "10", :boot_cmd_sequence => [ '<Tab> linux text biosdevname=0 ks=http://%IP%:%PORT%/ks.cfg<Enter><Enter>' ],
:kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
:ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
:ssh_host_port => "7222", :ssh_guest_port => "22",
:sudo_cmd => "echo '%p'|sudo -S sh '%f'",
:shutdown_cmd => "/sbin/halt -h -p",
- :postinstall_files => [ "postinstall.sh"], :postinstall_timeout => 10000
+ :postinstall_files => [ "postinstall.sh" ], :postinstall_timeout => 10000
})
View
4 templates/Fedora-18-i386/postinstall.sh
@@ -4,20 +4,22 @@ date > /etc/vagrant_box_build_time
VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
-yum -y update
+yum -y update --exclude kernel*
yum -y install \
ruby \
ruby-devel \
puppet \
rubygems \
+ rubygem-bunny \
rubygem-erubis \
rubygem-highline \
rubygem-json \
rubygem-mime-types \
rubygem-net-ssh \
rubygem-polyglot \
rubygem-rest-client \
+ rubygem-systemu \
rubygem-treetop \
rubygem-uuidtools \
wget \
View
10 templates/Fedora-18-x86_64/definition.rb
@@ -1,11 +1,11 @@
Veewee::Session.declare({
- # Minimum RAM requirement for installation is 768MB.
- :cpu_count => '1', :memory_size=> '768',
+ # Minimum RAM requirement for installation is 512MB.
+ :cpu_count => '1', :memory_size=> '512',
:disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :hwvirtext => 'on',
:os_type_id => 'Fedora_64',
- :iso_file => "Fedora-18-Beta-TC9-x86_64-DVD.iso",
- :iso_src => "http://dl.fedoraproject.org/pub/alt/stage/18-Beta-TC9/Fedora/x86_64/iso/Fedora-18-Beta-TC9-x86_64-DVD.iso",
- :iso_md5 => "4bc92931769a3cff344d706385cfaf77",
+ :iso_file => "Fedora-18-Beta-x86_64-DVD.iso",
+ :iso_src => "http://download.fedoraproject.org/pub/fedora/linux/releases/test/18-Beta/Fedora/x86_64/iso/Fedora-18-Beta-x86_64-DVD.iso",
+ :iso_md5 => "82b755826e205da0973404be937991a1",
:iso_download_timeout => 1000,
:boot_wait => "10", :boot_cmd_sequence => [ '<Tab> linux text biosdevname=0 ks=http://%IP%:%PORT%/ks.cfg<Enter><Enter>' ],
:kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
View
7 templates/Fedora-18-x86_64/postinstall.sh
@@ -4,20 +4,25 @@ date > /etc/vagrant_box_build_time
VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
-yum -y update
+# Must exclude kernel for now. Otherwise, kernel gets upgraded before reboot,
+# but VirtualBox tools get compiled against the old kernel, so the fresh
+# image will refuse to start under Vagrant.
+yum -y update --exclude kernel*
yum -y install \
ruby \
ruby-devel \
puppet \
rubygems \
+ rubygem-bunny \
rubygem-erubis \
rubygem-highline \
rubygem-json \
rubygem-mime-types \
rubygem-net-ssh \
rubygem-polyglot \
rubygem-rest-client \
+ rubygem-systemu \
rubygem-treetop \
rubygem-uuidtools \
wget \
Something went wrong with that request. Please try again.