boxgrinder-build 0.4.1 → 0.5.0

data/CHANGELOG

@@ -0,0 +1,7 @@
+
+v0.5.0
+
+* Plugins externalized from BoxGrinder Build
+* TODO
+
+v0.4.0

data/Rakefile

@@ -0,0 +1,11 @@
+require 'echoe'
+
+Echoe.new("boxgrinder-build") do |p|
+  p.project     = "BoxGrinder Build"
+  p.author      = "Marek Goldmann"
+  p.summary     = "A tool for creating appliances from simple plain text files for various virtual environments."
+  p.url         = "http://www.jboss.org/stormgrind/projects/boxgrinder.html"
+  p.email       = "info@boxgrinder.org"
+  p.ignore_pattern = /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git|\.log/
+  p.runtime_dependencies = ["commander >=4.0.3", "boxgrinder-core >=0.0.20"]
+end

data/bin/boxgrinder-build

@@ -21,45 +21,46 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
-require 'commander/import'
 require 'boxgrinder-core/helpers/log-helper'
+require 'boxgrinder-build/managers/plugin-manager'
 require 'boxgrinder-build/helpers/plugin-helper'
 require 'boxgrinder-build/appliance'
 
-gem 'boxgrinder-core', '>= 0.0.11'
-gem 'aws-s3', '>= 0.6.2'
-gem 'amazon-ec2', '>= 0.9.6'
-gem 'net-sftp', '>= 2.0.4'
-gem 'net-ssh', '>= 2.0.20'
-gem 'rake', '>= 0.8.7'
-gem 'progressbar', '>= 0.9.0'
+gem 'boxgrinder-core', '>= 0.0.20'
 gem 'commander', '>= 4.0.3'
 
-# :name is optional, otherwise uses the basename of this executable
+#$stderr.reopen($stdout)
 
-#$stderr.reopen('/dev/null')
+if Process.uid != 0
+  puts "This program must be executed with root privileges. Try 'sudo boxgrinder-build'"
+  abort
+end
+
+require 'commander/import'
 
 program :name, 'BoxGrinder Build'
-program :version, '0.4.1'
-program :description, 'A tool for building VM images from simple definition files.'
+program :version, '0.5.0'
+program :description, "A tool for building VM images from simple definition files."
+program :help, 'Hompepage', 'http://www.jboss.org/stormgrind/projects/boxgrinder/build.html'
+program :help, 'Documentation', 'http://community.jboss.org/docs/DOC-14358'
+program :help, 'Examples', "Run 'boxgrinder-build -h build' for more info about syntax."
 default_command :build
 
-$verbose = false
+$log_level = :info
 
-global_option('-V', '--verbose', TrueClass, "Prints verbose information while building. Default: false.") { $verbose = true}
+global_option('-V', '--verbose', TrueClass, "Prints debug information while building. Default: false.") { $log_level = :debug}
+global_option('-W', '--veryverbose', TrueClass, "Prints trace information while building. Default: false.") { $log_level = :trace}
 
 module BoxGrinder
-  log = LogHelper.new
-
-  PluginHelper.new( :log => log ).load_plugins
-
   command :build do |c|
     c.syntax      = 'build appliance_definition.appl [options]'
-    c.description = 'Creates a base image for selected appliance definition.'
+    c.description = 'Creates an image from selected appliance definition for selected platform.'
+    c.examples    = "boxgrinder-build test.appl -p vmware\nboxgrinder-build test.appl -p ec2 -d ami\nboxgrinder-build test.appl -d sftp"
 
-    c.option '-p STRING', '--platform STRING', String, "The type of platform. Valid types are: #{PlatformPluginManager.instance.plugins.keys.join(', ')}. Default: none."
-    c.option '-d STRING', '--delivery STRING', String, "The delivery type for selected image. Valid types are: #{DeliveryPluginManager.instance.types.keys.join(', ')}. Default: none."
-    c.option '-f', '--force', TrueClass, "Force image creation - removes all previous builds for selected appliance. Default: false."
+    c.option '-p STRING', '--platform STRING', String, "The type of platform. Default: none." # Valid types are: #{PlatformPluginManager.instance.plugins.keys.join(', ')}. Default: none."
+    c.option '-d STRING', '--delivery STRING', String, "The delivery type for selected image. Default: none." # Valid types are: #{DeliveryPluginManager.instance.types.keys.join(', ')}. Default: none."
+    c.option '-f STRING', '--force', TrueClass, "Force image creation - removes all previous builds for selected appliance. Default: false."
+    c.option '-l STRING', '--plugins STRING', String, "Comma separated list of plugins. Default: default plugins will be available."
 
     c.action do |args, options|
       options.default :platform => :none
@@ -69,17 +70,22 @@ module BoxGrinder
       options.name      = program(:name)
       options.version   = program(:version)
 
-      options.verbose   = $verbose
       options.platform  = options.platform.to_s.downcase.to_sym
       options.delivery  = options.delivery.to_s.downcase.to_sym
 
-      appliance_definition_file = args.shift or raise('Appliance definition file is required. Run boxgrinder-build -h for more info')
+      appliance_definition_file = args.shift or raise("You need to specify appliance definition file. Run 'boxgrinder-build -h' for more info")
 
       raise "Appliance definition file '#{appliance_definition_file}' could not be found" unless File.exists?( appliance_definition_file )
-      raise "Not known platform: #{options.platform}. Available platforms: #{PlatformPluginManager.instance.plugins.keys.join(', ')}." if PlatformPluginManager.instance.plugins[options.platform].nil? and options.platform != :none
-      raise "Not known delivery type: #{options.delivery}. Available types: #{DeliveryPluginManager.instance.types.keys.join(', ')}." if DeliveryPluginManager.instance.types.keys.include?(options.delivery).nil?  and options.delivery != :none
 
-      Appliance.new( appliance_definition_file, :options => options, :log => LogHelper.new( :threshold => $verbose ? :debug : :info ) ).create
+      log = LogHelper.new( :threshold => $log_level )
+
+      PluginHelper.new( :options => options, :log => log ).load_plugins
+      PluginManager.instance.log = log
+
+      raise "Not known platform: #{options.platform}. #{PluginManager.instance.plugins[:platform].empty? ? 'There are no platform plugins, please install one or more.' : "Available types: #{PluginManager.instance.plugin_types( :platform ).join(', ')}."}"  if PluginManager.instance.plugins[:platform][options.platform].nil? and options.platform != :none
+      raise "Not known delivery type: #{options.delivery}. #{PluginManager.instance.plugins[:delivery].empty? ? 'There are no delivery plugins, please install one or more.' : "Available types: #{PluginManager.instance.plugin_types( :delivery ).join(', ')}."}" if PluginManager.instance.plugin_types( :delivery ).include?(options.delivery).nil?  and options.delivery != :none
+
+      Appliance.new( appliance_definition_file, :options => options, :log => log ).create
     end
   end
 end

data/boxgrinder-build.gemspec

@@ -0,0 +1,38 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{boxgrinder-build}
+  s.version = "0.5.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Marek Goldmann"]
+  s.date = %q{2010-07-21}
+  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}
+  s.executables = ["boxgrinder-build"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/boxgrinder-build", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/appliance-customize-helper.rb", "lib/boxgrinder-build/helpers/guestfs-helper.rb", "lib/boxgrinder-build/helpers/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/boxgrinder-build", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/appliance-customize-helper.rb", "lib/boxgrinder-build/helpers/guestfs-helper.rb", "lib/boxgrinder-build/helpers/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "spec/Rakefile", "spec/appliance-spec.rb", "spec/helpers/appliance-customize-helper-spec.rb", "spec/helpers/guestfs-helper-spec.rb", "spec/helpers/linux-helper-spec.rb", "spec/helpers/package-helper-spec.rb", "spec/helpers/plugin-helper-spec.rb", "spec/managers/plugin-manager-spec.rb", "spec/plugins/base-plugin-spec.rb", "spec/rspec/src/appliances/jeos-f13.appl", "boxgrinder-build.gemspec"]
+  s.homepage = %q{http://www.jboss.org/stormgrind/projects/boxgrinder.html}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-build", "--main", "README"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{BoxGrinder Build}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{A tool for creating appliances from simple plain text files for various virtual environments.}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<commander>, [">= 4.0.3"])
+      s.add_runtime_dependency(%q<boxgrinder-core>, [">= 0.0.20"])
+    else
+      s.add_dependency(%q<commander>, [">= 4.0.3"])
+      s.add_dependency(%q<boxgrinder-core>, [">= 0.0.20"])
+    end
+  else
+    s.add_dependency(%q<commander>, [">= 4.0.3"])
+    s.add_dependency(%q<boxgrinder-core>, [">= 0.0.20"])
+  end
+end

data/lib/boxgrinder-build/appliance.rb

@@ -18,7 +18,6 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'rake/tasklib'
 require 'boxgrinder-core/models/appliance-config'
 require 'boxgrinder-core/models/config'
 require 'boxgrinder-core/helpers/appliance-helper'
@@ -26,7 +25,7 @@ require 'boxgrinder-core/helpers/appliance-config-helper'
 require 'boxgrinder-core/validators/appliance-config-validator'
 
 module BoxGrinder
-  class Appliance < Rake::TaskLib
+  class Appliance
 
     def initialize( appliance_definition_file, options = {} )
       @config                     = Config.new
@@ -45,79 +44,71 @@ module BoxGrinder
 
       @appliance_config = appliance_config_helper.merge(appliance_config.clone.init_arch).initialize_paths
 
-      ApplianceConfigValidator.new( @appliance_config, :os_plugins => OperatingSystemPluginManager.instance.plugins ).validate
+      ApplianceConfigValidator.new( @appliance_config, :os_plugins => PluginManager.instance.plugins[:os] ).validate
 
       if @options.force
         @log.info "Removing previous builds for #{@appliance_config.name} appliance..."
-        FileUtils.rm_rf( @appliance_config.path.dir.build )
+        FileUtils.rm_rf( @appliance_config.path.build )
         @log.debug "Previous builds removed."
       end
 
-      base_deliverables       = execute_os_plugin
-      platform_deliverables   = execute_platform_plugin( base_deliverables )
+      base_plugin_output       = execute_os_plugin
+      platform_plugin_output   = execute_platform_plugin( base_plugin_output )
 
-      execute_delivery_plugin( platform_deliverables )
+      execute_delivery_plugin( platform_plugin_output )
     end
 
     def execute_os_plugin
-      os_plugin = OperatingSystemPluginManager.instance.plugins[@appliance_config.os.name.to_sym]
-      os_plugin.init( @config, @appliance_config, :log => @log )
+      os_plugin, os_plugin_info = PluginManager.instance.initialize_plugin(:os, @appliance_config.os.name.to_sym )
+      os_plugin.init( @config, @appliance_config, :log => @log, :plugin_info => os_plugin_info )
 
-      if deliverables_exists( os_plugin.deliverables )
-        @log.info "Deliverables for #{os_plugin.info[:name]} operating system plugin exists, skipping."
-        return os_plugin.deliverables
+      if os_plugin.deliverables_exists?
+        @log.info "Deliverables for #{os_plugin_info[:name]} operating system plugin exists, skipping."
+        return { :deliverables => os_plugin.deliverables }
       end
 
       @log.debug "Executing operating system plugin for #{@appliance_config.os.name}..."
-      os_plugin.execute
+      os_plugin.run
       @log.debug "Operating system plugin executed."
 
-      os_plugin.deliverables
+      { :deliverables => os_plugin.deliverables, :plugin_info => os_plugin_info }
     end
 
-    def execute_platform_plugin( deliverables )
-      if @options.platform == :none
+    def execute_platform_plugin( previous_plugin_output )
+      if @options.platform == :none or @options.platform == nil
         @log.debug "No platform selected, skipping platform conversion."
-        return deliverables
+        return previous_plugin_output
       end
 
-      platform_plugin = PlatformPluginManager.instance.plugins[@options.platform]
-      platform_plugin.init( @config, @appliance_config, :log => @log )
+      platform_plugin, platform_plugin_info = PluginManager.instance.initialize_plugin(:platform, @options.platform )
+      platform_plugin.init( @config, @appliance_config, :log => @log, :plugin_info => platform_plugin_info, :previous_plugin_info => previous_plugin_output[:plugin_info], :previous_deliverables => previous_plugin_output[:deliverables] )
 
-      if deliverables_exists( platform_plugin.deliverables )
-        @log.info "Deliverables for #{platform_plugin.info[:name]} platform plugin exists, skipping."
-        return platform_plugin.deliverables
+      if platform_plugin.deliverables_exists?
+        @log.info "Deliverables for #{platform_plugin_info[:name]} platform plugin exists, skipping."
+        return { :deliverables => platform_plugin.deliverables, :plugin_info => platform_plugin_info }
       end
 
       @log.debug "Executing platform plugin for #{@options.platform}..."
-      platform_plugin.execute( deliverables[:disk] )
+      platform_plugin.run
       @log.debug "Platform plugin executed."
 
-      platform_plugin.deliverables
+      { :deliverables => platform_plugin.deliverables, :plugin_info => platform_plugin_info }
     end
 
-    def execute_delivery_plugin( deliverables )
-      if @options.delivery == :none
+    def execute_delivery_plugin( previous_plugin_output )
+      if @options.delivery == :none or @options.delivery == nil
         @log.debug "No delivery method selected, skipping delivering."
-        return deliverables
+        return
       end
 
-      delivery_plugin = DeliveryPluginManager.instance.types[@options.delivery]
-      delivery_plugin.init( @config, @appliance_config, :log => @log )
-      delivery_plugin.execute( deliverables, @options.delivery )
-    end
-
-    # TODO: move this to plugin (os,platform,delivery)
-    def deliverables_exists( deliverables )
-      return false unless File.exists?(deliverables[:disk])
+      delivery_plugin, delivery_plugin_info = PluginManager.instance.initialize_plugin(:delivery, @options.delivery )
+      delivery_plugin.init( @config, @appliance_config, :log => @log, :plugin_info => delivery_plugin_info, :previous_plugin_info => previous_plugin_output[:plugin_info], :previous_deliverables => previous_plugin_output[:deliverables] )
 
-      [:metadata, :other].each do |deliverable_type|
-        deliverables[deliverable_type].each_value do |file|
-          return false unless File.exists?(file)
-        end
+      if @options.delivery != delivery_plugin_info[:name]
+        delivery_plugin.run( @options.delivery )
+      else
+        delivery_plugin.run
       end
-
-      true
     end
   end
 end

data/lib/boxgrinder-build/helpers/appliance-customize-helper.rb

@@ -18,13 +18,13 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'rake/tasklib'
 require 'boxgrinder-core/validators/errors'
 require 'boxgrinder-build/helpers/guestfs-helper'
 require 'tempfile'
+require 'logger'
 
 module BoxGrinder
-  class ApplianceCustomizeHelper < Rake::TaskLib
+  class ApplianceCustomizeHelper
 
     def initialize( config, appliance_config, disk, options = {} )
       @config           = config
@@ -36,57 +36,12 @@ module BoxGrinder
     end
 
     def customize
-      @guestfs_helper = GuestFSHelper.new( @disk, :log => @log )
+      @guestfs_helper = GuestFSHelper.new( @disk, :log => @log ).run
       @guestfs = @guestfs_helper.guestfs
 
       yield @guestfs, @guestfs_helper
 
       @guestfs_helper.clean_close
     end
-
-    def validate_options( options )
-      options = {
-              :packages => {},
-              :repos => []
-      }.merge(options)
-
-      options[:packages][:yum] = options[:packages][:yum] || []
-      options[:packages][:yum_local] = options[:packages][:yum_local] || []
-      options[:packages][:rpm] = options[:packages][:rpm] || []
-
-      if ( options[:packages][:yum_local].size == 0 and options[:packages][:rpm].size == 0 and options[:packages][:yum].size == 0 and options[:repos].size == 0)
-        @log.debug "No additional local or remote packages or gems to install, skipping..."
-        return false
-      end
-
-      true
-    end
-
-    def install_packages( options = {} )
-      # silent return, we don't have any packages to install
-      return unless validate_options( options )
-
-      @guestfs_helper.rebuild_rpm_database
-
-      for repo in options[:repos]
-        @log.debug "Installing repo file '#{repo}'..."
-        @guestfs.sh( "rpm -Uvh #{repo}" )
-        @log.debug "Repo file '#{repo}' installed."
-      end unless options[:repos].nil?
-
-      unless options[:packages].nil?
-        for yum_package in options[:packages][:yum]
-          @log.debug "Installing package '#{yum_package}'..."
-          @guestfs.sh( "yum -y install #{yum_package}" )
-          @log.debug "Package '#{yum_package}' installed."
-        end unless options[:packages][:yum].nil?
-
-        for package in options[:packages][:rpm]
-          @log.debug "Installing package '#{package}'..."
-          @guestfs.sh( "rpm -Uvh --force #{package}" )
-          @log.debug "Package '#{package}' installed."
-        end unless options[:packages][:rpm].nil?
-      end
-    end
   end
 end

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

@@ -19,6 +19,63 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'guestfs'
+require 'logger'
+
+module BoxGrinder
+  class SilencerProxy
+    def initialize( o, destination )
+      @o            = o
+      @destination  = destination
+    end
+
+    def method_missing( m, *args, &block )
+      begin
+        redirect_streams( @destination ) do
+          @o.send(m, *args, &block)
+        end
+      rescue
+        raise
+      end
+    end
+
+    def redirect_streams( destination )
+      old_stdout_stream = STDOUT.dup
+      old_stderr_stream = STDERR.dup
+
+      STDOUT.reopen( destination )
+      STDERR.reopen( destination )
+
+      STDOUT.sync = true
+      STDERR.sync = true
+
+      yield
+    ensure
+      STDOUT.reopen( old_stdout_stream )
+      STDERR.reopen( old_stderr_stream )
+    end
+  end
+end
+
+module Guestfs
+  class Guestfs
+    alias_method :sh_original, :sh
+
+    def sh( command )
+      begin
+        output = sh_original( command )
+        puts output
+      rescue => e
+        puts "Error occurred while executing above command. Appliance may not work properly."
+      end
+
+      output
+    end
+
+    def redirect( destination )
+      BoxGrinder::SilencerProxy.new( self, destination )
+    end
+  end
+end
 
 module BoxGrinder
   class GuestFSHelper
@@ -27,31 +84,58 @@ module BoxGrinder
       @log      = options[:log] || Logger.new(STDOUT)
 
       @partitions = {}
-
-      launch
     end
 
     attr_reader :guestfs
 
-    def launch
+    def customize
+      read_pipe, write_pipe = IO.pipe
+
+      fork do
+        read_pipe.each do |o|
+          if o.chomp.strip.eql?("<EOF>")
+            exit
+          else
+            @log.trace "GFS: #{o.chomp.strip}"
+          end
+        end
+      end
+
+      helper = execute( write_pipe )
+
+      yield @guestfs, helper
+
+      clean_close
+
+      write_pipe.puts "<EOF>"
+
+      Process.wait
+    end
+
+    def execute( pipe = nil )
       @log.debug "Preparing guestfs..."
-      @guestfs = Guestfs::create
+
+      @guestfs = pipe.nil? ? Guestfs::create : Guestfs::create.redirect( pipe )
 
       # TODO remove this, https://bugzilla.redhat.com/show_bug.cgi?id=502058
       @guestfs.set_append( "noapic" )
 
+      @guestfs.set_verbose(1)
+      @guestfs.set_trace(1)
+
       # workaround for latest qemu
       # It'll only work if qemu-stable package is installed. It is installed by default on meta-appliance
       # TODO wait for stable qemu and remove this
+      # Looks like in F13 (qemu-img-0.12.3-8.fc13.i686) this is fixed
       qemu_wrapper = "/usr/share/qemu-stable/bin/qemu.wrapper"
 
       if File.exists?( qemu_wrapper )
         @guestfs.set_qemu( qemu_wrapper )
       end
 
-      @log.debug "Adding drive '#{@raw_disk}'..."
+      @log.trace "Adding drive '#{@raw_disk}'..."
       @guestfs.add_drive( @raw_disk )
-      @log.debug "Drive added."
+      @log.trace "Drive added."
 
       @log.debug "Launching guestfs..."
       @guestfs.launch
@@ -65,23 +149,25 @@ module BoxGrinder
           mount_partitions
       end
 
-      @log.debug "Guestfs launched."
+      @log.trace "Guestfs launched."
+
+      self
     end
 
     def clean_close
-      @log.debug "Closing guestfs..."
+      @log.trace "Closing guestfs..."
 
       @guestfs.sync
       @guestfs.umount_all
       @guestfs.close
 
-      @log.debug "Guestfs closed."
+      @log.trace "Guestfs closed."
     end
 
     def mount_partition( part, mount_point )
-      @log.debug "Mounting #{part} partition to #{mount_point}..."
+      @log.trace "Mounting #{part} partition to #{mount_point}..."
       @guestfs.mount_options( "", part, mount_point )
-      @log.debug "Partition mounted."
+      @log.trace "Partition mounted."
     end
 
     # TODO this is shitty, I know... https://bugzilla.redhat.com/show_bug.cgi?id=507188
@@ -112,4 +198,4 @@ module BoxGrinder
       end
     end
   end
-end
+end

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

@@ -0,0 +1,69 @@
+# JBoss, Home of Professional Open Source
+# Copyright 2009, Red Hat Middleware LLC, and individual contributors
+# by the @authors tag. See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+require 'logger'
+
+module BoxGrinder
+  class LinuxHelper
+    def initialize( options = {} )
+      @log = options[:log] || Logger.new(STDOUT)
+    end
+
+    def kernel_version( guestfs )
+      kernel_versions = guestfs.ls("/lib/modules")
+      version         = kernel_versions.last
+
+      if kernel_versions.size > 1
+        kernel_versions.each do |v|
+          if v.match(/PAE$/)
+            version = v
+            break
+          end
+        end
+      end
+
+      version
+    end
+
+    def kernel_image_name( guestfs )
+      guestfs.sh("ls -1 /boot | grep initramfs | wc -l").chomp.strip.to_i > 0 ? "initramfs" : "initrd"
+    end
+
+    def recreate_kernel_image( guestfs, modules = [] )
+      kernel_version      = kernel_version( guestfs )
+      kernel_image_name   = kernel_image_name( guestfs )
+
+      if guestfs.exists("/sbin/dracut") != 0
+        command = "/sbin/dracut -f -v --add-drivers #{modules.join(' ')}"
+      else
+        drivers_argument = ""
+        modules.each { |mod| drivers_argument  << " --preload=#{mod}" }
+
+        command = "/sbin/mkinitrd -f -v#{drivers_argument}"
+      end
+
+      @log.trace "Additional modules to preload in kernel: #{modules.join(', ')}"
+
+      @log.debug "Recreating kernel image for #{kernel_version} kernel..."
+      guestfs.sh( "#{command} /boot/#{kernel_image_name}-#{kernel_version}.img #{kernel_version}" )
+      @log.debug "Kernel image recreated."
+    end
+  end
+end

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

@@ -20,35 +20,44 @@
 
 module BoxGrinder
   class PackageHelper
-    def initialize(config, appliance_config, options = {})
+    def initialize(config, appliance_config, dir, options = {})
       @config           = config
       @appliance_config = appliance_config
+      @dir              = dir
 
       @log              = options[:log] || Logger.new(STDOUT)
       @exec_helper      = options[:exec_helper] || ExecHelper.new({:log => @log})
     end
 
-    def package(deliverables, type = :tar)
-      files = []
-      files << File.basename(deliverables[:disk])
+    def package(deliverables, options = {})
+      type        =  options[:type]     || :tar
+      plugin_info =  options[:plugin_info]
+
+      platform = 'raw'
 
-      [:metadata, :other].each do |deliverable_type|
-        deliverables[deliverable_type].each_value do |file|
-          files << File.basename(file)
+      unless plugin_info.nil?
+        if plugin_info[:type] == :platform
+          platform = plugin_info[:name].to_s
         end
       end
 
-      deliverable_platform  = deliverables[:platform].nil? ? "" : deliverables[:platform]
-      package_path          = "#{@appliance_config.path.dir.packages}/#{@appliance_config.name}-#{@appliance_config.version}.#{@appliance_config.release}-#{@appliance_config.hardware.arch}-#{deliverable_platform}.tgz"
+      files = []
+
+      deliverables.each_value do |file|
+        files << File.basename(file)
+      end
+
+      #TODO rewrite this to use deliverables and previous_deliverables
+      package_path = "#{@dir.tmp}/#{@appliance_config.name}-#{@appliance_config.version}.#{@appliance_config.release}-#{@appliance_config.os.name}-#{@appliance_config.os.version}-#{@appliance_config.hardware.arch}-#{platform}.tgz"
 
       if File.exists?(package_path)
-        @log.info "Package of #{type} type for #{@appliance_config.name} appliance and #{deliverable_platform} platform already exists, skipping."
+        @log.info "Package of #{type} type for #{@appliance_config.name} appliance and #{platform} platform already exists, skipping."
         return package_path
       end
 
       FileUtils.mkdir_p(File.dirname(package_path))
 
-      @log.info "Packaging #{@appliance_config.name} appliance for #{deliverable_platform} platform to #{type}..."
+      @log.info "Packaging #{@appliance_config.name} appliance for #{platform} platform to #{type}..."
 
       case type
         when :tar