matthewtodd-captain 0.1.2 → 0.1.3

data/Rakefile

@@ -14,7 +14,7 @@ else
   require 'shoe'
 end
 
-Shoe.tie('captain', '0.1.2', 'Builds an Ubuntu installation CD just as you like it.') do |spec|
+Shoe.tie('captain', '0.1.3', 'Builds an Ubuntu installation CD just as you like it.') do |spec|
   spec.requirements = ['mkisofs']
   spec.add_development_dependency 'cucumber'
 end

data/captain.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{captain}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Todd"]
-  s.date = %q{2009-08-24}
+  s.date = %q{2009-09-05}
   s.default_executable = %q{captain}
   s.email = %q{matthew.todd@gmail.com}
   s.executables = ["captain"]
   s.extra_rdoc_files = ["README.rdoc"]
   s.files = ["Rakefile", "captain.gemspec", "README.rdoc", "bin/captain", "examples/chef_client.rb", "features/installer_image.feature", "features/steps", "features/steps/captain_steps.rb", "features/support", "features/support/env.rb", "features/support/helpers.rb", "lib/captain", "lib/captain/application.rb", "lib/captain/image.rb", "lib/captain/package.rb", "lib/captain/package_list.rb", "lib/captain/release.rb", "lib/captain/remote.rb", "lib/captain/resource.rb", "lib/captain.rb", "resources/disk_base_components.erb", "resources/disk_base_installable.erb", "resources/disk_cd_type.erb", "resources/disk_info.erb", "resources/disk_udeb_include.erb", "resources/isolinux.bin", "resources/isolinux.cfg", "resources/preseed.seed.erb", "resources/release.erb", "resources/release_component.erb"]
-  s.rdoc_options = ["--main", "README.rdoc", "--title", "captain-0.1.2", "--inline-source"]
+  s.rdoc_options = ["--main", "README.rdoc", "--title", "captain-0.1.3", "--inline-source"]
   s.require_paths = ["lib"]
   s.requirements = ["mkisofs"]
   s.rubygems_version = %q{1.3.5}

data/lib/captain/application.rb

@@ -55,6 +55,9 @@ module Captain
       Resource.template('disk_udeb_include.erb',     template_binding).copy_to(working_directory, '.disk', 'udeb_include')
     end
 
+    # FIXME adjust isolinux.cfg to provide a boot menu, defaulting to first
+    # hard disk, just in case the machine's configured to prefer booting from
+    # the CD.
     def create_boot_loader
       Resource.file('isolinux.bin').copy_to(working_directory, 'isolinux', 'isolinux.bin')
       Resource.file('isolinux.cfg').copy_to(working_directory, 'isolinux', 'isolinux.cfg')

data/resources/isolinux.cfg

@@ -1,9 +1,11 @@
-# Don't show the boot: prompt
-prompt 0
+# Automatically boot the default label after 10 (= 100 10ths of a) second
+timeout 100
+default normal
+say Type install at the boot: prompt to boot the installer.
 
-# Automatically boot the linux kernel after 1 (= 10 10ths of a) second
-timeout 10
+label normal
+  localboot -1
 
-label linux
+label install
   kernel /install/vmlinuz
   append file=/cdrom/install/preseed.seed initrd=/install/initrd.gz quiet locale=en_US console-setup/layoutcode=us netcfg/choose_interface=auto --

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: matthewtodd-captain
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Matthew Todd
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-24 00:00:00 -07:00
+date: 2009-09-05 00:00:00 -07:00
 default_executable: captain
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,7 @@ rdoc_options:
 - --main
 - README.rdoc
 - --title
-- captain-0.1.2
+- captain-0.1.3
 - --inline-source
 require_paths: 
 - lib