boxgrinder-build 0.9.7 → 0.9.8

data/CHANGELOG

@@ -1,3 +1,11 @@
+v0.9.8
+
+* [BGBUILD-312] Only use root privileges when necessary
+* [BGBUILD-267] Add CentOS 6 support
+* [BGBUILD-310] BoxGrinder doesn't build appliances when Fedora 16 is the host
+* [BGBUILD-157] Add Alignment options for virtual appliances
+* [BGBUILD-321] For EBS AMIs use the filesystem type specified for root partition
+
 v0.9.7
 
 * [BGBUILD-307] Appliance with swap file fails to build if selected OS is centos

data/Manifest

@@ -89,4 +89,17 @@ spec/plugins/delivery/ebs/ebs.yaml
 spec/plugins/delivery/elastichosts/elastichosts-plugin-spec.rb
 spec/plugins/delivery/local/local-plugin-spec.rb
 spec/plugins/delivery/s3/s3-plugin-spec.rb
-spec/plugins/delivery/sftp/sftp-plugin-
+spec/plugins/delivery/sftp/sftp-plugin-spec.rb
+spec/plugins/os/centos/centos-plugin-spec.rb
+spec/plugins/os/fedora/fedora-plugin-spec.rb
+spec/plugins/os/rhel/rhel-plugin-spec.rb
+spec/plugins/os/rpm-based/kickstart-spec.rb
+spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb
+spec/plugins/os/rpm-based/rpm-dependency-validator-spec.rb
+spec/plugins/os/rpm-based/src/jeos-f13-plain.ks
+spec/plugins/os/rpm-based/src/jeos-f13-without-version.ks
+spec/plugins/os/rpm-based/src/jeos-f13.ks
+spec/plugins/os/sl/sl-plugin-spec.rb
+spec/plugins/platform/ec2/ec2-plugin-spec.rb
+spec/plugins/platform/virtualbox/virtualbox-plugin-spec.rb
+spec/plugins/platform/vmware/vmware-plugin-spec.rb

data/bin/boxgrinder-build

@@ -19,16 +19,13 @@
 
 require 'optparse'
 require 'rubygems'
+require 'pathname'
+require 'rbconfig'
 require 'hashery/opencascade'
 require 'boxgrinder-core/models/config'
 require 'boxgrinder-core/helpers/log-helper'
 require 'boxgrinder-build/appliance'
 
-if Process.uid != 0
-  puts "This program must be executed with root privileges. Try 'sudo #{File.basename($0)}'."
-  abort
-end
-
 options = OpenCascade.new(
     :platform => :none,
     :delivery => :none,
@@ -38,6 +35,8 @@ options = OpenCascade.new(
     :additional_plugins => []
 )
 
+ARGV_DUP = ARGV.clone
+
 def validate_hash_option(options, name, value)
   value.each do |entry|
     if entry =~ /^(\S+):(\S+)$/
@@ -152,10 +151,23 @@ EOB
   end
 end
 
+def ensure_root
+  unless Process.uid == 0
+    puts("Currently running as non-root user, BoxGrinder will attempt to re-launch under 'sudo -E'")
+    # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/151376
+    ruby = File.join(Config::CONFIG["bindir"],
+                     Config::CONFIG["RUBY_INSTALL_NAME"] + Config::CONFIG["EXEEXT"])
+    exec("sudo -E #{ruby} -I#{$:.join(':')} #{Pathname.new(__FILE__).realpath} #{ARGV_DUP.join(" ")}")
+  end
+end
+
 opts = process_options(options)
 
 begin
   opts.parse!
+
+  ensure_root
+
   if ARGV.empty? or ARGV.size > 1
     puts opts
     puts

data/boxgrinder-build.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.9.7"
+  s.version = "0.9.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-09-10}
+  s.date = %q{2011-11-15}
   s.default_executable = %q{boxgrinder-build}
   s.description = %q{A tool for creating appliances from simple plain text files for various virtual environments.}
   s.email = %q{info@boxgrinder.org}

data/integ/appliances/jeos-centos5-files.appl

@@ -11,5 +11,5 @@ files:
   "/opt/abc":
     - "http://ftp.tpnet.pl/vol/d1/apache//couchdb/1.0.3/apache-couchdb-1.0.3.tar.gz"
     - "https://raw.github.com/boxgrinder/boxgrinder-build/master/README.md"
-    - "ftp://ftp.fu-berlin.de/unix/www/apache/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz"
+    - "ftp://ftp.fu-berlin.de/unix/www/squid/archive/3.0/squid-3.0.STABLE25.tar.gz"
 

data/integ/appliances/jeos-f16-files.appl

@@ -10,5 +10,5 @@ files:
   "/opt/abc":
     - "http://ftp.tpnet.pl/vol/d1/apache//couchdb/1.0.3/apache-couchdb-1.0.3.tar.gz"
     - "https://raw.github.com/boxgrinder/boxgrinder-build/master/README.md"
-    - "ftp://ftp.fu-berlin.de/unix/www/apache/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz"
+    - "ftp://ftp.fu-berlin.de/unix/www/squid/archive/3.0/squid-3.0.STABLE25.tar.gz"
 

data/integ/spec/files-spec.rb

@@ -55,7 +55,7 @@ module BoxGrinder
         guestfs.exists('/opt/etc/sysconfig/network').should == 1
         guestfs.exists('/opt/abc/apache-couchdb-1.0.3.tar.gz').should == 1
         guestfs.exists('/opt/abc/README.md').should == 1
-        guestfs.exists('/opt/abc/apache-couchdb-1.1.0.tar.gz').should == 1
+        guestfs.exists('/opt/abc/squid-3.0.STABLE25.tar.gz').should == 1
       end
     end
 

data/integ/spec/jeos-spec.rb

@@ -71,6 +71,15 @@ module BoxGrinder
         @config.merge!(:platform => :ec2, :delivery => :ami)
         @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-centos5.appl", @config, :log => @log).create
       end
+
+      it "should build CentOS 6 JEOS" do
+        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-centos6.appl", @config, :log => @log).create
+      end
+
+      it "should build CentOS 6 JEOS and create an AMI" do
+        @config.merge!(:platform => :ec2, :delivery => :ami)
+        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-centos6.appl", @config, :log => @log).create
+      end
     end
 
     context "platform plugin" do

data/lib/boxgrinder-build.rb

@@ -16,4 +16,4 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'boxgrinder-build/appliance'
+require 'boxgrinder-build/appliance'

data/lib/boxgrinder-build/appliance.rb

@@ -133,14 +133,38 @@ module BoxGrinder
     def execute_plugin(plugin, param = nil)
       if plugin.deliverables_exists?
         @log.info "Deliverables for #{plugin.plugin_info[:name]} #{plugin.plugin_info[:type]} plugin exists, skipping."
-        return
-      end
+      else
+        @log.debug "Executing #{plugin.plugin_info[:type]} plugin..."
+
+        param.nil? ? plugin.run : plugin.run(param)
 
-      @log.debug "Executing #{plugin.plugin_info[:type]} plugin..."
+        @log.debug "#{plugin.plugin_info[:type].to_s.capitalize} plugin executed."
+      end
+      if plugin.plugin_info[:type] == :os
+        FileUtils.chown_R(@config.uid, @config.gid, File.join(@config.dir.root, @config.dir.build))
+        @log.debug "Lowering from root to user."
+        change_user(@config.uid, @config.gid)
+      end
+    end
 
-      param.nil? ? plugin.run : plugin.run(param)
+    def change_user(u, g)
+      begin
+        if Process::Sys.respond_to?(:setresgid) && Process::Sys.respond_to?(:setresuid)
+          Process::Sys.setresgid(g, g, g)
+          Process::Sys.setresuid(u, u, u)
+          return
+        end
+      rescue NotImplementedError
+      end
 
-      @log.debug "#{plugin.plugin_info[:type].to_s.capitalize} plugin executed."
+      begin
+        # JRuby doesn't support saved ids, use this instead.
+        Process.gid = g
+        Process.egid = g
+        Process.uid = u
+        Process.euid = u
+      rescue NotImplementedError
+      end
     end
   end
 end

data/lib/boxgrinder-build/helpers/guestfs-helper.rb

@@ -269,7 +269,7 @@ module BoxGrinder
       # extended partition is always #3
       partitions.delete_at(3) if partitions.size > 4
 
-      partitions.reject { |i| !(i =~ /^#{device}/) or (@guestfs.vfs_type(i) == 'swap' and !options[:list_swap]) }
+      partitions.reject { |i| !(i =~ /^#{device}/) or (@guestfs.vfs_type(i) == '') or (@guestfs.vfs_type(i) == 'swap' and !options[:list_swap]) }
     end
 
     def umount_partition(part)

data/lib/boxgrinder-build/helpers/image-helper.rb

@@ -82,8 +82,9 @@ module BoxGrinder
       guestfs.mkmountpoint('/out')
       guestfs.mkmountpoint('/out/in')
 
-      # Create filesystem on EC2 disk
-      guestfs.mkfs(@appliance_config.default_filesystem_type, out_device)
+      # Create filesystem on destination device
+      # https://issues.jboss.org/browse/BGBUILD-321
+      guestfs.mkfs(@appliance_config.hardware.partitions['/']['type'], out_device)
       # Set root partition label
       guestfs.set_e2label(out_device, '79d3d2d4') # This is a CRC32 from /
 

data/lib/boxgrinder-build/plugins/base-plugin.rb

@@ -179,13 +179,11 @@ module BoxGrinder
 
     def run(param = nil)
       unless is_supported_os?
-        @log.error "#{@plugin_info[:full_name]} plugin supports following operating systems: #{supported_oses}. Your appliance contains #{@appliance_config.os.name} #{@appliance_config.os.version} operating system which is not supported by this plugin, sorry."
-        return
+        raise PluginValidationError, "#{@plugin_info[:full_name]} plugin supports following operating systems: #{supported_oses}. Your appliance contains #{@appliance_config.os.name} #{@appliance_config.os.version} operating system which is not supported by this plugin, sorry."
       end
 
       unless is_supported_platform?
-        @log.error "#{@plugin_info[:full_name]} plugin supports following platforms: #{@supported_platforms.join(', ')}. You selected #{@previous_plugin_info[:name]} platform which is not supported by this plugin, sorry."
-        return
+        raise PluginValidationError, "#{@plugin_info[:full_name]} plugin supports following platforms: #{@supported_platforms.join(', ')}. You selected #{@previous_plugin_info[:name]} platform which is not supported by this plugin, sorry."
       end
 
       FileUtils.rm_rf @dir.tmp

data/lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb

@@ -67,7 +67,7 @@ module BoxGrinder
     def after_init
       register_supported_os('fedora', ['13', '14', '15', '16'])
       register_supported_os('rhel', ['6'])
-      register_supported_os('centos', ['5'])
+      register_supported_os('centos', ['5', '6'])
     end
 
     def execute

data/lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb

@@ -28,7 +28,7 @@ module BoxGrinder
 
     def after_init
       register_supported_os("fedora", ['13', '14', '15', '16'])
-      register_supported_os("centos", ['5'])
+      register_supported_os("centos", ['5', '6'])
       register_supported_os("rhel", ['5', '6'])
       register_supported_os("sl", ['5', '6'])
 

data/lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb

@@ -21,26 +21,28 @@ require 'boxgrinder-build/plugins/os/rhel/rhel-plugin'
 module BoxGrinder
   class CentOSPlugin < RHELPlugin
 
-    CENTOS_REPOS = {
-        "5" => {
-            "base" => {
-                "mirrorlist" => "http://mirrorlist.centos.org/?release=#OS_VERSION#&arch=#BASE_ARCH#&repo=os"
-            },
-            "updates" => {
-                "mirrorlist" => "http://mirrorlist.centos.org/?release=#OS_VERSION#&arch=#BASE_ARCH#&repo=updates"
-            }
-        }
-    }
-
     def after_init
       super
-      register_supported_os('centos', ['5'])
+      register_supported_os('centos', ['5', '6'])
     end
 
     def execute(appliance_definition_file)
-      build_rhel(appliance_definition_file, CENTOS_REPOS)
+      repos = {}
+
+     @plugin_info[:versions].each do |version|
+      repos[version] = {
+          "base" => {
+              "mirrorlist" => "http://mirrorlist.centos.org/?release=#OS_VERSION#&arch=#BASE_ARCH#&repo=os"
+          },
+          "updates" => {
+              "mirrorlist" => "http://mirrorlist.centos.org/?release=#OS_VERSION#&arch=#BASE_ARCH#&repo=updates"
+          }
+        }
+      end
+
+      build_rhel(appliance_definition_file, repos)
     end
   end
 end
 
-plugin :class => BoxGrinder::CentOSPlugin, :type => :os, :name => :centos, :full_name  => "CentOS", :versions   => ["5"]
+plugin :class => BoxGrinder::CentOSPlugin, :type => :os, :name => :centos, :full_name  => "CentOS", :versions   => ["5", "6"]

data/lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb

@@ -23,7 +23,7 @@ module BoxGrinder
     def after_init
       super
       register_supported_os('fedora', ["13", "14", "15", "16", "rawhide"])
-      set_default_config_value('PAE',true)
+      set_default_config_value('PAE', true)
     end
 
     def execute(appliance_definition_file)
@@ -45,8 +45,6 @@ module BoxGrinder
       build_with_appliance_creator(appliance_definition_file, @repos) do |guestfs, guestfs_helper|
         if @appliance_config.os.version >= "15"
           disable_biosdevname(guestfs)
-          # https://issues.jboss.org/browse/BGBUILD-298
-          switch_to_grub2(guestfs, guestfs_helper) if @appliance_config.os.version >= "16"
           change_runlevel(guestfs)
           disable_netfs(guestfs)
           link_mtab(guestfs)
@@ -69,27 +67,19 @@ module BoxGrinder
         @plugin_config['PAE'] ? packages << "kernel-PAE" : packages << "kernel"
       end
 
-      packages << "-grub2" if @appliance_config.os.version >= "16"
-    end
-
-    # Since Fedora 16 by default GRUB2 is used - we remove Legacy GRUB
-    # and use GRUB2 instead
-    #
-    # https://issues.jboss.org/browse/BGBUILD-280
-    def switch_to_grub2(guestfs, guestfs_helper)
-      @log.debug "Switching to GRUB2..."
-      guestfs_helper.sh("yum -y remove grub")
-      guestfs_helper.sh("yum -y install grub2")
-      # Disabling biosdevname in GRUB2
-      guestfs.write("/etc/default/grub", "GRUB_CMDLINE_LINUX=\"quiet rhgb biosdevname=0\"\n") if guestfs.exists("/boot/grub2/grub.cfg") != 0
-      # We are using only one disk, so this is save
-      guestfs.sh("cd / && grub2-install --force #{guestfs.list_devices.first}")
-      guestfs.sh("cd / && grub2-mkconfig -o /boot/grub2/grub.cfg")
-      @log.debug "Using GRUB2 from now."
+      if @appliance_config.os.version >= "16"
+        packages << "grub2"
+      else
+        packages << "grub"
+      end
     end
 
     def disable_biosdevname(guestfs)
       @log.debug "Disabling biosdevname..."
+      if guestfs.exists("/boot/grub2/grub.cfg") != 0
+        guestfs.write("/etc/default/grub", "GRUB_CMDLINE_LINUX=\"quiet rhgb biosdevname=0\"\n")
+        guestfs.sh("cd / && grub2-mkconfig -o /boot/grub2/grub.cfg")
+      end
       guestfs.sh('sed -i "s/kernel\(.*\)/kernel\1 biosdevname=0/g" /boot/grub/grub.conf') if guestfs.exists("/boot/grub/grub.conf") != 0
       @log.debug "Biosdevname disabled."
     end

data/lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb

@@ -36,7 +36,7 @@ module BoxGrinder
 
     def normalize_packages(packages)
       # https://issues.jboss.org/browse/BGBUILD-89
-      add_packages(packages, ['@core', 'curl'])
+      add_packages(packages, ['@core', 'curl', 'grub'])
 
       case @appliance_config.os.version
         when '5'

data/lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb

@@ -268,8 +268,10 @@ module BoxGrinder
       end
 
       # /boot/grub/grub.conf
-      if grub = guestfs.read_file('/boot/grub/grub.conf').gsub!(/(\/dev\/sda.)/) { |path| "LABEL=#{guestfs.vfs_label(path.gsub('/dev/sda', device))}" }
-        guestfs.write_file('/boot/grub/grub.conf', grub, 0)
+      if guestfs.exists('/boot/grub/grub.conf') != 0
+        if grub = guestfs.read_file('/boot/grub/grub.conf').gsub!(/(\/dev\/sda.)/) { |path| "LABEL=#{guestfs.vfs_label(path.gsub('/dev/sda', device))}" }
+          guestfs.write_file('/boot/grub/grub.conf', grub, 0)
+        end
       end
       @log.debug "Done."
     end

data/lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb

@@ -20,6 +20,9 @@ rootpw --iscrypted <%= appliance_config.os.password.crypt((0...8).map { 65.+(ran
 # appliance-creator doesn't support labels...
 # --label Zlib.crc32(root).to_s(16)
 
+<% if appliance_config.os.name == 'fedora' and appliance_config.os.version >= '16' %>
+part biosboot --size 5 --fstype biosboot --ondisk sda
+<% end %>
 <% mount_points.each do |root| %>
 <% partition = appliance_config.hardware.partitions[root]%>
 part <%= root %> --size <%= (partition['size'].to_f * 1024).to_i %> --fstype <%= root.eql?('swap') ? 'swap' : partition['type'] %> <% unless partition['options'].nil? %> --fsoptions '<%= partition['options'] %>' <% end %> <% if partition['passphrase'] %> --encrypted --passphrase='<%= partition['passphrase'] %>' <% end %> --ondisk sda<% end %>

data/lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb

@@ -26,7 +26,7 @@ module BoxGrinder
       register_deliverable(:disk => "#{@appliance_config.name}.ec2")
 
       register_supported_os('fedora', ['13', '14', '15', '16'])
-      register_supported_os('centos', ['5'])
+      register_supported_os('centos', ['5', '6'])
       register_supported_os('sl', ['5', '6'])
       register_supported_os('rhel', ['5', '6'])
     end
@@ -45,7 +45,7 @@ module BoxGrinder
           # Remove normal kernel
           guestfs.sh("yum -y remove kernel")
           # because we need to install kernel-xen package
-          guestfs.sh("yum -y install kernel-xen")
+          guestfs_helper.sh("yum -y install kernel-xen", :arch => @appliance_config.hardware.arch)
           # and add require modules
           @linux_helper.recreate_kernel_image(guestfs, ['xenblk', 'xennet'])
         end

data/rubygem-boxgrinder-build.spec

@@ -5,7 +5,7 @@
 
 Summary: A tool for creating appliances from simple plain text files
 Name: rubygem-%{gemname}
-Version: 0.9.7
+Version: 0.9.8
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
@@ -130,6 +130,14 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Fri Oct 14 2011 Marc Savy <msavy@redhat.com> - 0.9.8-1
+- Upstream release: 0.9.8
+- [BGBUILD-312] Only use root privileges when necessary
+- [BGBUILD-267] Add CentOS 6 support
+- [BGBUILD-310] BoxGrinder doesn't build appliances when Fedora 16 is the host
+- [BGBUILD-157] Add Alignment options for virtual appliances
+- [BGBUILD-321] For EBS AMIs use the filesystem type specified for root partition
+
 * Tue Sep 06 2011 Marek Goldmann <mgoldman@redhat.com> - 0.9.7-1
 - Upstream release: 0.9.7
 - [BGBUILD-307] Appliance with swap file fails to build if selected OS is centos

data/spec/appliance-spec.rb

@@ -26,7 +26,8 @@ module BoxGrinder
   describe Appliance do
     def prepare_appliance(options = {}, definition_file = "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.appl")
       @log = LogHelper.new(:level => :trace, :type => :stdout)
-      @config = OpenCascade.new(:platform => :none, :delivery => :none, :force => false).merge(options)
+      @config = OpenCascade.new(:platform => :none, :delivery => :none, :force => false,
+                                :uid => 501, :gid => 501, :dir => {:root => '/', :build => 'build'}).merge(options)
 
       @plugin_manager = mock(PluginManager)
 
@@ -327,6 +328,30 @@ module BoxGrinder
 
         @appliance.execute_plugin(plugin, :s3)
       end
+
+      context "user switching" do
+        before(:each) do
+          FileUtils.stub!(:chown_R)
+          @appliance.stub!(:change_user)
+        end
+
+        it "should switch to user from root after execution of OS plugin" do
+          plugin = mock('OSPlugin', :deliverables_exists? => false, :plugin_info => {:name => :test, :type => :os})
+          FileUtils.should_receive(:chown_R).with(501, 501, '/build')
+          @appliance.should_receive(:change_user).with(501, 501)
+          plugin.should_receive(:run).with(:test)
+
+          @appliance.execute_plugin(plugin, :test)
+        end
+
+        it "should switch to user from root after OS plugin even if deliverables exist" do
+          plugin = mock('OSPlugin', :deliverables_exists? => true, :plugin_info => {:name => :test, :type => :os})
+          FileUtils.should_receive(:chown_R).with(501, 501, '/build')
+          @appliance.should_receive(:change_user).with(501, 501)
+
+          @appliance.execute_plugin(plugin, :test)
+        end
+      end
     end
 
     context "preparations" do
@@ -350,5 +375,30 @@ module BoxGrinder
         @appliance.delivery_selected?.should == false
       end
     end
+
+    context ".change_user" do
+      before(:each) do
+        prepare_appliance
+      end
+      context "Interpreters supporting changes to real, effective and saved ids" do
+        it "should change the real, effective and saved uid & gid" do
+          Process::Sys.should_receive(:respond_to?).twice.and_return(true)
+          Process::Sys.should_receive(:setresuid).with(501, 501, 501)
+          Process::Sys.should_receive(:setresgid).with(502, 502, 502)
+          @appliance.change_user(501, 502)
+        end
+      end
+      context "Interpreters only supporting changes to real and effective ids" do
+        it "should change the real and effective uid & gid" do
+          Process::Sys.should_receive(:respond_to?).once.and_return(false)
+          Process.should_receive(:gid=).with(502)
+          Process.should_receive(:egid=).with(502)
+          Process.should_receive(:uid=).with(501)
+          Process.should_receive(:euid=).with(501)
+          @appliance.change_user(501, 502)
+        end
+      end
+    end
+
   end
 end

data/spec/helpers/guestfs-helper-spec.rb

@@ -228,8 +228,8 @@ module BoxGrinder
 
         @appliance_config.stub!(:hardware).and_return(OpenCascade.new(:partitions => {'/' => nil, '/home' => nil}))
         guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
-        guestfs.should_receive(:vfs_type).with('/dev/vda1').and_return('ext3')
-        guestfs.should_receive(:vfs_type).with('/dev/vda2').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/vda1').twice.and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/vda2').twice.and_return('ext3')
 
         @helper.should_receive(:mount_partition).with('/dev/vda1', '/', '')
         @helper.should_receive(:mount_partition).with('/dev/vda2', '/home', '')
@@ -238,14 +238,28 @@ module BoxGrinder
         @helper.mount_partitions('/dev/vda')
       end
 
+      it "should mount partitions skiping partitions with undefined filesystem type" do
+        guestfs = mock('Guestfs')
+
+        @appliance_config.stub!(:hardware).and_return(OpenCascade.new(:partitions => {'/' => nil}))
+        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
+        guestfs.should_receive(:vfs_type).with('/dev/vda1').and_return('')
+        guestfs.should_receive(:vfs_type).with('/dev/vda2').twice.and_return('ext3')
+
+        @helper.should_receive(:mount_partition).with('/dev/vda2', '/', '')
+
+        @helper.instance_variable_set(:@guestfs, guestfs)
+        @helper.mount_partitions('/dev/vda')
+      end
+
       it "should mount two partitions from three where one is a swap partition" do
         guestfs = mock('Guestfs')
 
         @appliance_config.stub!(:hardware).and_return(OpenCascade.new(:partitions => {'/' => nil, '/home' => nil, 'swap' => nil}))
         guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2', '/dev/vda3'])
-        guestfs.should_receive(:vfs_type).with('/dev/vda1').and_return('ext3')
-        guestfs.should_receive(:vfs_type).with('/dev/vda2').and_return('ext3')
-        guestfs.should_receive(:vfs_type).with('/dev/vda3').and_return('swap')
+        guestfs.should_receive(:vfs_type).with('/dev/vda1').twice.and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/vda2').twice.and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/vda3').twice.and_return('swap')
 
         @helper.should_receive(:mount_partition).with('/dev/vda1', '/', '')
         @helper.should_receive(:mount_partition).with('/dev/vda2', '/home', '')
@@ -259,10 +273,10 @@ module BoxGrinder
 
         @appliance_config.stub!(:hardware).and_return(OpenCascade.new(:partitions => {'/' => nil, '/home' => nil, '/var/www' => nil, '/var/mock' => nil}))
         guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2', '/dev/vda3', '/dev/vda4', '/dev/vda5'])
-        guestfs.should_receive(:vfs_type).with('/dev/vda1').and_return('ext3')
-        guestfs.should_receive(:vfs_type).with('/dev/vda2').and_return('ext3')
-        guestfs.should_receive(:vfs_type).with('/dev/vda3').and_return('ext4')
-        guestfs.should_receive(:vfs_type).with('/dev/vda5').and_return('ext4')
+        guestfs.should_receive(:vfs_type).with('/dev/vda1').twice.and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/vda2').twice.and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/vda3').twice.and_return('ext4')
+        guestfs.should_receive(:vfs_type).with('/dev/vda5').twice.and_return('ext4')
 
         @helper.should_receive(:mount_partition).with('/dev/vda1', '/', '')
         @helper.should_receive(:mount_partition).with('/dev/vda2', '/home', '')
@@ -362,8 +376,8 @@ module BoxGrinder
         @helper.instance_variable_set(:@guestfs, guestfs)
 
         guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
-        guestfs.should_receive(:vfs_type).with('/dev/vda1').and_return('ext3')
-        guestfs.should_receive(:vfs_type).with('/dev/vda2').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/vda1').twice.and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/vda2').twice.and_return('ext3')
 
         @helper.should_receive(:umount_partition).ordered.with('/dev/vda2')
         @helper.should_receive(:umount_partition).ordered.with('/dev/vda1')
@@ -429,8 +443,8 @@ module BoxGrinder
         @helper.instance_variable_set(:@guestfs, guestfs)
 
         guestfs.should_receive(:list_partitions).and_return(['/dev/sda1', '/dev/sda2'])
-        guestfs.should_receive(:vfs_type).with('/dev/sda1').and_return('ext3')
-        guestfs.should_receive(:vfs_type).with('/dev/sda2').and_return('swap')
+        guestfs.should_receive(:vfs_type).with('/dev/sda1').twice.and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/sda2').twice.and_return('swap')
 
         @helper.mountable_partitions('/dev/sda').should == ['/dev/sda1']
       end
@@ -440,8 +454,8 @@ module BoxGrinder
         @helper.instance_variable_set(:@guestfs, guestfs)
 
         guestfs.should_receive(:list_partitions).and_return(['/dev/sda1', '/dev/sda2'])
-        guestfs.should_receive(:vfs_type).with('/dev/sda1').and_return('ext3')
-        guestfs.should_receive(:vfs_type).with('/dev/sda2').and_return('swap')
+        guestfs.should_receive(:vfs_type).with('/dev/sda1').twice.and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/sda2').twice.and_return('swap')
 
         @helper.mountable_partitions('/dev/sda', :list_swap => true).should == ['/dev/sda1', '/dev/sda2']
       end
@@ -451,10 +465,10 @@ module BoxGrinder
         @helper.instance_variable_set(:@guestfs, guestfs)
 
         guestfs.should_receive(:list_partitions).and_return(['/dev/sda1', '/dev/sda2', '/dev/sda3', '/dev/sda4', '/dev/sda5'])
-        guestfs.should_receive(:vfs_type).with('/dev/sda1').and_return('ext3')
-        guestfs.should_receive(:vfs_type).with('/dev/sda2').and_return('ext3')
-        guestfs.should_receive(:vfs_type).with('/dev/sda3').and_return('ext3')
-        guestfs.should_receive(:vfs_type).with('/dev/sda5').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/sda1').twice.and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/sda2').twice.and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/sda3').twice.and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/sda5').twice.and_return('ext3')
 
         @helper.mountable_partitions('/dev/sda').should == ['/dev/sda1', '/dev/sda2', '/dev/sda3', '/dev/sda5']
       end

data/spec/plugins/base-plugin-spec.rb

@@ -128,15 +128,13 @@ module BoxGrinder
       it "should fail if OS is not supported" do
         @plugin.register_supported_os('fedora', ['12', '13'])
         @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '14'}))
-        @log.should_receive(:error).with('Amazon Simple Storage Service (Amazon S3) plugin supports following operating systems: fedora (versions: 12, 13). Your appliance contains fedora 14 operating system which is not supported by this plugin, sorry.')
-        @plugin.run
+        lambda { @plugin.run }.should raise_error(PluginValidationError, 'Amazon Simple Storage Service (Amazon S3) plugin supports following operating systems: fedora (versions: 12, 13). Your appliance contains fedora 14 operating system which is not supported by this plugin, sorry.')
       end
 
       it "should fail if platform is not supported" do
         @plugin.instance_variable_set(:@previous_plugin_info, {:type => :platform, :name => :ec2})
         @plugin.register_supported_platform('vmware')
-        @log.should_receive(:error).with('Amazon Simple Storage Service (Amazon S3) plugin supports following platforms: vmware. You selected ec2 platform which is not supported by this plugin, sorry.')
-        @plugin.run
+        lambda {  @plugin.run }.should raise_error(PluginValidationError, 'Amazon Simple Storage Service (Amazon S3) plugin supports following platforms: vmware. You selected ec2 platform which is not supported by this plugin, sorry.')
       end
 
       it "should not fail if previous plugin is not a platform plugin" do

data/spec/plugins/delivery/ebs/ebs-plugin-spec.rb

@@ -86,7 +86,7 @@ module BoxGrinder
       Set.new(supported_oses.keys).should == Set.new(['fedora', 'rhel', 'centos'])
       supported_oses['rhel'].should == ['6']
       supported_oses['fedora'].should == ['13', '14', '15', '16']
-      supported_oses['centos'].should == ['5']
+      supported_oses['centos'].should == ['5', '6']
     end
 
     it "should adjust fstab" do

data/spec/plugins/delivery/s3/s3-plugin-spec.rb

@@ -77,7 +77,7 @@ module BoxGrinder
 
       supportes_oses.size.should == 4
       Set.new(supportes_oses.keys).should == Set.new(['centos', 'fedora', 'rhel', 'sl'])
-      supportes_oses['centos'].should == ['5']
+      supportes_oses['centos'].should == ['5', '6']
       supportes_oses['rhel'].should == ['5', '6']
       supportes_oses['sl'].should == ['5', '6']
       supportes_oses['fedora'].should == ['13', '14', '15', '16']

data/spec/plugins/os/fedora/fedora-plugin-spec.rb

@@ -72,31 +72,50 @@ module BoxGrinder
       @appliance_config.should_receive(:is64bit?).and_return(false)
 
       @plugin.normalize_packages(packages)
-      packages.should == ["abc", "def", "@core", "system-config-firewall-base", "dhclient", "kernel"]
+      packages.should == ["abc", "def", "@core", "system-config-firewall-base", "dhclient", "kernel", "grub"]
+    end
+
+    it "should normalize packages for Fedora 16" do
+      @appliance_config.stub!(:os).and_return(OpenCascade.new(:name => 'fedora', :version => '16'))
+
+      packages = ['abc', 'def', 'kernel']
+
+      @plugin.normalize_packages(packages)
+      packages.should == ["abc", "def", "@core", "system-config-firewall-base", "dhclient", "kernel", "grub2"]
     end
 
     it "should normalize packages for 64bit" do
       packages = ['abc', 'def', 'kernel']
 
       @plugin.normalize_packages(packages)
-      packages.should == ["abc", "def", "@core", "system-config-firewall-base", "dhclient", "kernel"]
+      packages.should == ["abc", "def", "@core", "system-config-firewall-base", "dhclient", "kernel", "grub"]
     end
 
     it "should add packages for fedora 13" do
       packages = []
 
       @plugin.normalize_packages(packages)
-      packages.should == ["@core", "system-config-firewall-base", "dhclient", "kernel"]
+      packages.should == ["@core", "system-config-firewall-base", "dhclient", "kernel", "grub"]
     end
 
     context "BGBUILD-204" do
       it "should disable bios device name hints for GRUB legacy" do
         guestfs = mock("GuestFS")
+        guestfs.should_receive(:exists).with("/boot/grub2/grub.cfg").and_return(0)
         guestfs.should_receive(:exists).with("/boot/grub/grub.conf").and_return(1)
         guestfs.should_receive(:sh).with("sed -i \"s/kernel\\(.*\\)/kernel\\1 biosdevname=0/g\" /boot/grub/grub.conf")
         @plugin.disable_biosdevname(guestfs)
       end
 
+      it "should disable bios device name hints for GRUB2" do
+        guestfs = mock("GuestFS")
+        guestfs.should_receive(:exists).with("/boot/grub2/grub.cfg").and_return(1)
+        guestfs.should_receive(:exists).with("/boot/grub/grub.conf").and_return(0)
+        guestfs.should_receive(:write).with("/etc/default/grub", "GRUB_CMDLINE_LINUX=\"quiet rhgb biosdevname=0\"\n")
+        guestfs.should_receive(:sh).with("cd / && grub2-mkconfig -o /boot/grub2/grub.cfg")
+        @plugin.disable_biosdevname(guestfs)
+      end
+
       it "should change to runlevel 3 by default" do
         guestfs = mock("GuestFS")
         guestfs.should_receive(:rm).with("/etc/systemd/system/default.target")
@@ -117,18 +136,6 @@ module BoxGrinder
       @plugin.link_mtab(guestfs)
     end
 
-    it "should replace GRUB legacy with GRUB2" do
-      guestfs = mock("GuestFS")
-      guestfs_helper = mock("GuestFSHelper")
-      guestfs_helper.should_receive(:sh).ordered.with("yum -y remove grub")
-      guestfs_helper.should_receive(:sh).ordered.with("yum -y install grub2")
-      guestfs.should_receive(:list_devices).and_return(['/dev/vda'])
-      guestfs.should_receive(:sh).ordered.with("cd / && grub2-install --force /dev/vda")
-      guestfs.should_receive(:sh).ordered.with("cd / && grub2-mkconfig -o /boot/grub2/grub.cfg")
-      guestfs.should_receive(:exists).with("/boot/grub2/grub.cfg").and_return(1)
-      guestfs.should_receive(:write).with("/etc/default/grub", "GRUB_CMDLINE_LINUX=\"quiet rhgb biosdevname=0\"\n")
-      @plugin.switch_to_grub2(guestfs, guestfs_helper)
-    end
     describe ".execute" do
       it "should make Fedora 15 or higher work" do
         @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '15'}))
@@ -155,7 +162,6 @@ module BoxGrinder
 
         @plugin.should_receive(:normalize_packages).ordered
         @plugin.should_receive(:disable_biosdevname).ordered.with(guestfs)
-        @plugin.should_receive(:switch_to_grub2).ordered.with(guestfs, guestfs_helper)
         @plugin.should_receive(:change_runlevel).ordered.with(guestfs)
         @plugin.should_receive(:disable_netfs).ordered.with(guestfs)
         @plugin.should_receive(:link_mtab).ordered.with(guestfs)

data/spec/plugins/os/rhel/rhel-plugin-spec.rb

@@ -55,14 +55,15 @@ module BoxGrinder
 
         @plugin.normalize_packages(packages)
 
-        packages.size.should == 7
+        packages.size.should == 8
         packages[0].should == '@core'
         packages[1].should == 'curl'
-        packages[2].should == 'kernel'
-        packages[3].should == 'system-config-securitylevel-tui'
-        packages[4].should == 'util-linux'
-        packages[5].should == 'setarch'
-        packages[6].should == 'sudo'
+        packages[2].should == 'grub'
+        packages[3].should == 'kernel'
+        packages[4].should == 'system-config-securitylevel-tui'
+        packages[5].should == 'util-linux'
+        packages[6].should == 'setarch'
+        packages[7].should == 'sudo'
       end
 
       it "should not add kernel package if kernel-xen is already choose" do
@@ -72,14 +73,15 @@ module BoxGrinder
 
         @plugin.normalize_packages(packages)
 
-        packages.size.should == 7
+        packages.size.should == 8
         packages[0].should == 'kernel-xen'
         packages[1].should == '@core'
         packages[2].should == 'curl'
-        packages[3].should == 'system-config-securitylevel-tui'
-        packages[4].should == 'util-linux'
-        packages[5].should == 'setarch'
-        packages[6].should == 'sudo'
+        packages[3].should == 'grub'
+        packages[4].should == 'system-config-securitylevel-tui'
+        packages[5].should == 'util-linux'
+        packages[6].should == 'setarch'
+        packages[7].should == 'sudo'
       end
 
       it "should not add default packages for RHEL 6" do
@@ -87,11 +89,12 @@ module BoxGrinder
 
         @plugin.normalize_packages(packages)
 
-        packages.size.should == 4
+        packages.size.should == 5
         packages[0].should == '@core'
         packages[1].should == 'curl'
-        packages[2].should == 'kernel'
-        packages[3].should == 'system-config-firewall-base'
+        packages[2].should == 'grub'
+        packages[3].should == 'kernel'
+        packages[4].should == 'system-config-firewall-base'
       end
     end
 

data/spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb

@@ -161,6 +161,7 @@ module BoxGrinder
         guestfs = mock("guestfs")
 
         guestfs.should_receive(:list_devices).and_return(['/dev/hda'])
+        guestfs.should_receive(:exists).with('/boot/grub/grub.conf').and_return(1)
 
         guestfs.should_receive(:read_file).with('/etc/fstab').and_return("/dev/sda1 / something\nLABEL=/boot /boot something\n")
         guestfs.should_receive(:vfs_label).with('/dev/hda1').and_return('/')
@@ -177,6 +178,7 @@ module BoxGrinder
         guestfs = mock("guestfs")
 
         guestfs.should_receive(:list_devices).and_return(['/dev/sda'])
+        guestfs.should_receive(:exists).with('/boot/grub/grub.conf').and_return(1)
 
         guestfs.should_receive(:read_file).with('/etc/fstab').and_return("LABEL=/ / something\nLABEL=/boot /boot something\n")
         guestfs.should_not_receive(:vfs_label)

data/spec/plugins/platform/ec2/ec2-plugin-spec.rb

@@ -272,7 +272,7 @@ module BoxGrinder
         guestfs.should_receive(:upload).with("/etc/resolv.conf", "/etc/resolv.conf")
         guestfs.should_receive(:mkdir).with("/data")
         guestfs.should_receive(:sh).with("yum -y remove kernel")
-        guestfs.should_receive(:sh).with("yum -y install kernel-xen")
+        guestfs_helper.should_receive(:sh).with("yum -y install kernel-xen", :arch => 'i686')
 
         @plugin.should_receive(:create_devices).with(guestfs)
         @plugin.should_receive(:upload_fstab).with(guestfs)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-10 00:00:00 +02:00
+date: 2011-11-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency