boxgrinder-build 0.9.1 → 0.9.2

data/CHANGELOG

@@ -1,3 +1,15 @@
+v0.9.2
+
+* [BGBUILD-148] Add support for building CentOS/RHEL images on Fedora
+* [BGBUILD-204] Fedora 15 appliance networking start on boot failed
+* [BGBUILD-208] Kickstart files not working with 0.9.1
+* [BGBUILD-205] Error while converting to EC2 when guest OS is CentOS/RHEL 5
+* [BGBUILD-213] CloudSigma support
+* [BGBUILD-209] Wrong /etc/mtab on Fedora 15 appliances causes errors
+* [BGBUILD-203] Vmware vmdk disk size is wrong when installing via kickstart files
+* [BGBUILD-207] Guestfs dies on Fedora 15 with 'KVM not supported for this target' message
+* [BGBUILD-83] Enable libguestfs log callback to redirect guestfs output to logger
+
 v0.9.1
 
 * [BGBUILD-188] Use libuestfs instead mounting partitions manually for EC2 appliances

data/boxgrinder-build.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-04-27}
+  s.date = %q{2011-05-17}
   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.md", "bin/boxgrinder-build", "lib/boxgrinder-build.rb", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/guestfs-helper.rb", "lib/boxgrinder-build/helpers/image-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", "lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb", "lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem", "lib/boxgrinder-build/plugins/delivery/sftp/sftp-plugin.rb", "lib/boxgrinder-build/plugins/delivery/usb/usb-plugin.rb", "lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb", "lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb", "lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/kickstart.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb", "lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb", "lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo", "lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init", "lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit", "lib/boxgrinder-build/plugins/platform/ec2/src/ifcfg-eth0", "lib/boxgrinder-build/plugins/platform/ec2/src/menu.lst", "lib/boxgrinder-build/plugins/platform/ec2/src/rc_local", "lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb", "lib/boxgrinder-build/plugins/platform/vmware/src/README-enterprise", "lib/boxgrinder-build/plugins/platform/vmware/src/README-personal", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmdk", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx", "lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "bin/boxgrinder-build", "boxgrinder-build.gemspec", "lib/boxgrinder-build.rb", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/guestfs-helper.rb", "lib/boxgrinder-build/helpers/image-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", "lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb", "lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem", "lib/boxgrinder-build/plugins/delivery/sftp/sftp-plugin.rb", "lib/boxgrinder-build/plugins/delivery/usb/usb-plugin.rb", "lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb", "lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb", "lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/kickstart.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb", "lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb", "lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo", "lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init", "lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit", "lib/boxgrinder-build/plugins/platform/ec2/src/ifcfg-eth0", "lib/boxgrinder-build/plugins/platform/ec2/src/menu.lst", "lib/boxgrinder-build/plugins/platform/ec2/src/rc_local", "lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb", "lib/boxgrinder-build/plugins/platform/vmware/src/README-enterprise", "lib/boxgrinder-build/plugins/platform/vmware/src/README-personal", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmdk", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx", "lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb", "rubygem-boxgrinder-build.spec", "spec/Rakefile", "spec/appliance-spec.rb", "spec/helpers/augeas-helper-spec.rb", "spec/helpers/guestfs-helper-spec.rb", "spec/helpers/image-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/plugins/delivery/ebs/ebs-plugin-spec.rb", "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.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/platform/ec2/ec2-plugin-spec.rb", "spec/plugins/platform/virtualbox/virtualbox-plugin-spec.rb", "spec/plugins/platform/vmware/vmware-plugin-spec.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "bin/boxgrinder-build", "lib/boxgrinder-build.rb", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/guestfs-helper.rb", "lib/boxgrinder-build/helpers/image-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/helpers/qemu.wrapper", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb", "lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem", "lib/boxgrinder-build/plugins/delivery/sftp/sftp-plugin.rb", "lib/boxgrinder-build/plugins/delivery/usb/usb-plugin.rb", "lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb", "lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb", "lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/kickstart.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb", "lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb", "lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo", "lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init", "lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit", "lib/boxgrinder-build/plugins/platform/ec2/src/ifcfg-eth0", "lib/boxgrinder-build/plugins/platform/ec2/src/menu.lst", "lib/boxgrinder-build/plugins/platform/ec2/src/rc_local", "lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb", "lib/boxgrinder-build/plugins/platform/vmware/src/README-enterprise", "lib/boxgrinder-build/plugins/platform/vmware/src/README-personal", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmdk", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx", "lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "bin/boxgrinder-build", "boxgrinder-build.gemspec", "lib/boxgrinder-build.rb", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/guestfs-helper.rb", "lib/boxgrinder-build/helpers/image-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/helpers/qemu.wrapper", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb", "lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem", "lib/boxgrinder-build/plugins/delivery/sftp/sftp-plugin.rb", "lib/boxgrinder-build/plugins/delivery/usb/usb-plugin.rb", "lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb", "lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb", "lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/kickstart.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb", "lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb", "lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo", "lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init", "lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit", "lib/boxgrinder-build/plugins/platform/ec2/src/ifcfg-eth0", "lib/boxgrinder-build/plugins/platform/ec2/src/menu.lst", "lib/boxgrinder-build/plugins/platform/ec2/src/rc_local", "lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb", "lib/boxgrinder-build/plugins/platform/vmware/src/README-enterprise", "lib/boxgrinder-build/plugins/platform/vmware/src/README-personal", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmdk", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx", "lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb", "rubygem-boxgrinder-build.spec", "spec/Rakefile", "spec/appliance-spec.rb", "spec/helpers/augeas-helper-spec.rb", "spec/helpers/guestfs-helper-spec.rb", "spec/helpers/image-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/plugins/delivery/ebs/ebs-plugin-spec.rb", "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.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/platform/ec2/ec2-plugin-spec.rb", "spec/plugins/platform/virtualbox/virtualbox-plugin-spec.rb", "spec/plugins/platform/vmware/vmware-plugin-spec.rb"]
   s.homepage = %q{http://boxgrinder.org/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-build", "--main", "README.md"]
   s.require_paths = ["lib"]

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

@@ -22,67 +22,6 @@ require 'guestfs'
 require 'rbconfig'
 require 'resolv'
 
-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 respond_to?(m)
-      @o.respond_to?(m)
-    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, aborting."
-        raise e
-      end
-
-      output
-    end
-
-    def redirect(destination)
-      BoxGrinder::SilencerProxy.new(self, destination)
-    end
-  end
-end
-
 module BoxGrinder
   class GuestFSHelper
     def initialize(disks, appliance_config, config, options = {})
@@ -103,7 +42,7 @@ module BoxGrinder
         ec2 = false
       end
 
-      if `cat /proc/cpuinfo | grep flags | grep vmx | wc -l`.chomp.strip.to_i > 0 and !ec2
+      if `egrep '^flags.*(vmx|svm)' /proc/cpuinfo | wc -l`.chomp.strip.to_i > 0 and !ec2
         @log.trace "HW acceleration available."
         return true
       end
@@ -113,67 +52,96 @@ module BoxGrinder
       false
     end
 
-    def customize(options = {})
-      read_pipe, write_pipe = IO.pipe
+    # https://issues.jboss.org/browse/BGBUILD-83
+    def log_callback
+      log = Proc.new do |event, event_handle, buf, array|
+        buf.chomp!
+
+        if event == 64
+          @log.trace "GFS: #{buf}"
+        else
+          @log.debug "GFS: #{buf}"
+        end
+      end
+
+      # Guestfs::EVENT_APPLIANCE  => 16
+      # Guestfs::EVENT_LIBRARY    => 32
+      # Guestfs::EVENT_TRACE      => 64
+
+      # Referencing int instead of constants make it easier to test
+      @guestfs.set_event_callback(log, 16 | 32 | 64)
+
+      yield if block_given?
+    end
+
+    # If log callback aren't available we will fail to this, which sucks...
+    def log_hack
+      read_stderr, write_stderr = IO.pipe
 
       fork do
-        read_pipe.each do |o|
-          if o.chomp.strip.eql?("<EOF>")
-            exit
-          else
-            @log.trace "GFS: #{o.chomp.strip}"
-          end
+        write_stderr.close
+
+        read_stderr.each do |l|
+          @log.trace "GFS: #{l.chomp.strip}"
         end
+
+        read_stderr.close
       end
 
-      helper = execute(write_pipe, options)
+      old_stderr = STDERR.clone
 
-      yield @guestfs, helper
+      STDERR.reopen(write_stderr)
+      STDERR.sync = true
 
-      clean_close
+      begin
+        # Execute all tasks
+        yield if block_given?
+      ensure
+        STDERR.reopen(old_stderr)
+      end
 
-      write_pipe.puts "<EOF>"
+      write_stderr.close
+      read_stderr.close
 
       Process.wait
     end
 
-    def execute(pipe = nil, options = {})
-      options = {
-          :ide_disk => false,
-          :mount_prefix => '',
-          :automount => true,
-          :load_selinux_policy => true
-      }.merge(options)
-
+    def initialize_guestfs(options = {})
       @log.debug "Preparing guestfs..."
-
       @log.trace "Setting libguestfs temporary directory to '#{@config.dir.tmp}'..."
 
       FileUtils.mkdir_p(@config.dir.tmp)
-
       ENV['TMPDIR'] = @config.dir.tmp
 
-      @guestfs = pipe.nil? ? Guestfs::create : Guestfs::create.redirect(pipe)
+      @guestfs = Guestfs::create
 
-      # https://bugzilla.redhat.com/show_bug.cgi?id=502058
-      @guestfs.set_append("noapic")
+      if @guestfs.respond_to?(:set_event_callback)
+        @log.trace "We have event callbacks available!"
+        log_callback { prepare_guestfs(options) { yield } }
+      else
+        @log.trace "We don't have event callbacks available :( Falling back to proxy."
+        log_hack { prepare_guestfs(options) { yield } }
+      end
+    end
 
+    def prepare_guestfs(options = {})
       @log.trace "Setting debug + trace..."
       @guestfs.set_verbose(1)
       @guestfs.set_trace(1)
 
+      # https://bugzilla.redhat.com/show_bug.cgi?id=502058
+      @guestfs.set_append("noapic")
+
       @log.trace "Enabling SElinux support in guestfs..."
       @guestfs.set_selinux(1)
 
       unless hw_virtualization_available?
         # This wrapper is required especially for EC2 where running qemu-kvm crashes libguestfs
-        qemu_wrapper = (RbConfig::CONFIG['host_cpu'].eql?('x86_64') ? "/usr/bin/qemu-system-x86_64" : "/usr/bin/qemu")
+        qemu_wrapper = "#{File.dirname(__FILE__)}/qemu.wrapper"
 
-        if File.exists?(qemu_wrapper)
-          @log.trace "Setting QEMU wrapper to #{qemu_wrapper}..."
-          @guestfs.set_qemu(qemu_wrapper)
-          @log.trace "QEMU wrapper set."
-        end
+        @log.trace "Setting QEMU wrapper to #{qemu_wrapper}..."
+        @guestfs.set_qemu(qemu_wrapper)
+        @log.trace "QEMU wrapper set."
       end
 
       @disks.each do |disk|
@@ -191,6 +159,27 @@ module BoxGrinder
         @guestfs.set_network(1)
       end
 
+      yield
+    end
+
+    def customize(options = {})
+      initialize_guestfs(options) do
+        helper = execute(options)
+
+        yield @guestfs, helper
+
+        clean_close
+      end
+    end
+
+    def execute(options = {})
+      options = {
+          :ide_disk => false,
+          :mount_prefix => '',
+          :automount => true,
+          :load_selinux_policy => true
+      }.merge(options)
+
       @log.debug "Launching guestfs..."
       @guestfs.launch
 
@@ -245,6 +234,9 @@ module BoxGrinder
     def mount_partition(part, mount_point, mount_prefix = '')
       @log.trace "Mounting #{part} partition to #{mount_point}..."
       @guestfs.mount_options("", part, "#{mount_prefix}#{mount_point}")
+      # By the way - update the labels so we don't have to muck again with partitions
+      # this will be done for every mount, but shouldn't hurt too much.
+      @guestfs.set_e2label(part, Zlib.crc32(mount_point).to_s(16))
       @log.trace "Partition mounted."
     end
 
@@ -254,16 +246,8 @@ module BoxGrinder
       @log.trace "Mounting partitions..."
 
       partitions = mountable_partitions(device)
-
       mount_points = LinuxHelper.new(:log => @log).partition_mount_points(@appliance_config.hardware.partitions)
-
-      partitions.each_index do |i|
-        mount_partition(partitions[i], mount_points[i], mount_prefix)
-
-        # By the way - update the labels so we don't have to muck again with partitions
-        # this will be done for every mount, but shouldn't hurt too much.
-        @guestfs.set_e2label(partitions[i], Zlib.crc32(mount_points[i]).to_s(16))
-      end
+      partitions.each_index { |i| mount_partition(partitions[i], mount_points[i], mount_prefix) }
     end
 
     def mountable_partitions(device)

data/lib/boxgrinder-build/helpers/qemu.wrapper

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ "`echo "$@" | grep "kvm" | wc -l`" -eq "1" ]; then
+  args=( "$@" "-no-kvm" )
+else
+  args=( "$@" )
+fi
+
+if [ "`uname -r | grep x86_64 | wc -l`" -eq "1" ]; then
+  bin=/usr/bin/qemu-system-x86_64
+else
+  bin=/usr/bin/qemu
+fi
+
+exec $bin "${args[@]}"

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

@@ -116,7 +116,8 @@ module BoxGrinder
         while !f.eof?
           f.seek(part * @step, File::SEEK_SET)
 
-          data = compress(f.read(@step))
+          data = f.read(@step)
+          data = compress(data) unless is_cloudsigma?
           upload_chunk(data, part)
 
           part += 1
@@ -148,10 +149,12 @@ module BoxGrinder
       begin
         @log.info "Uploading part #{part+1}..."
 
+        headers = {:content_type => "application/octet-stream"}
+        headers['Content-Encoding'] = 'gzip' unless is_cloudsigma?
+
         RestClient.post url,
                         data,
-                        :content_type => "application/octet-stream",
-                        'Content-Encoding' => 'gzip'
+                        headers
 
         @log.info "Part #{part+1} uploaded."
       rescue => e

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

@@ -41,13 +41,14 @@ module BoxGrinder
 
     def read_kickstart(file)
       appliance_config = ApplianceConfig.new
-
       appliance_config.name = File.basename(file, '.ks')
 
       name = nil
       version = nil
 
-      File.read(file).each do |line|
+      kickstart = File.read(file)
+
+      kickstart.each do |line|
         n = line.scan(/^# bg_os_name: (.*)/).flatten.first
         v = line.scan(/^# bg_os_version: (.*)/).flatten.first
 
@@ -61,6 +62,29 @@ module BoxGrinder
       appliance_config.os.name = name
       appliance_config.os.version = version
 
+      partitions = {}
+
+      kickstart.each do |line|
+        # Parse also the partition scheme
+        if line =~ /^part ([\/\w]+)/
+          root = $1
+          partitions[root] = {}
+
+          # size
+          partitions[root]['size'] = $1.to_f / 1024 if line =~ /--size[=\s]*(\d+)/
+          # fs type
+          partitions[root]['type'] = $1 if line =~ /--fstype[=\s]*(\w+)/
+          # fs options
+          partitions[root]['options'] = $1 if line =~ /--fsoptions[=\s]*([,\w]+)/
+
+          raise "Partition size not specified for #{root} partition in #{file}" if partitions[root]['size'].nil?
+        end
+      end
+
+      raise "No partitions specified in your kickstart file #{file}" if partitions.empty?
+
+      appliance_config.hardware.partitions = partitions
+
       appliance_config
     end
 
@@ -69,10 +93,9 @@ module BoxGrinder
         kickstart_file = appliance_definition_file
       else
         kickstart_file = Kickstart.new(@config, @appliance_config, repos, @dir, :log => @log).create
+        RPMDependencyValidator.new(@config, @appliance_config, @dir, kickstart_file, @options).resolve_packages
       end
 
-      RPMDependencyValidator.new(@config, @appliance_config, @dir, kickstart_file, @options).resolve_packages
-
       @log.info "Building #{@appliance_config.name} appliance..."
 
       execute_appliance_creator(kickstart_file)
@@ -94,6 +117,13 @@ module BoxGrinder
         set_motd(guestfs)
         install_repos(guestfs)
 
+        if @appliance_config.os.name == 'fedora' and @appliance_config.os.version == '15'
+          disable_biosdevname(guestfs)
+          change_runlevel(guestfs)
+          disable_netfs(guestfs)
+          link_mtab(guestfs)
+        end
+
         guestfs.sh("chkconfig firstboot off") if guestfs.exists('/etc/init.d/firstboot') != 0
 
         @log.info "Executing post operations after build..."
@@ -110,6 +140,9 @@ module BoxGrinder
         yield guestfs, guestfs_helper if block_given?
 
         @log.info "Post operations executed."
+
+        # https://issues.jboss.org/browse/BGBUILD-148
+        recreate_rpm_database(guestfs, guestfs_helper) if @config.os.name != @appliance_config.os.name or @config.os.version != @appliance_config.os.version
       end
 
       @log.info "Base image for #{@appliance_config.name} appliance was built successfully."
@@ -124,6 +157,49 @@ module BoxGrinder
       end
     end
 
+    # https://issues.jboss.org/browse/BGBUILD-204
+    def disable_biosdevname(guestfs)
+      @log.debug "Disabling biosdevname for Fedora 15..."
+      guestfs.sh('sed -i "s/kernel\(.*\)/kernel\1 biosdevname=0/g" /boot/grub/grub.conf')
+      @log.debug "Biosdevname disabled."
+    end
+
+    # https://issues.jboss.org/browse/BGBUILD-204
+    def change_runlevel(guestfs)
+      @log.debug "Changing runlevel to multi-user non-graphical..."
+      guestfs.rm("/etc/systemd/system/default.target")
+      guestfs.ln_sf("/lib/systemd/system/multi-user.target", "/etc/systemd/system/default.target")
+      @log.debug "Runlevel changed."
+    end
+
+    # https://issues.jboss.org/browse/BGBUILD-204
+    def disable_netfs(guestfs)
+      @log.debug "Disabling network filesystem mounting..."
+      guestfs.sh("chkconfig netfs off")
+      @log.debug "Network filesystem mounting disabled."
+    end
+
+    # https://issues.jboss.org/browse/BGBUILD-209
+    def link_mtab(guestfs)
+      @log.debug "Linking /etc/mtab to /proc/self/mounts for Fedora 15..."
+      guestfs.ln_sf("/proc/self/mounts", "/etc/mtab")
+      @log.debug "/etc/mtab linked."
+    end
+
+    # https://issues.jboss.org/browse/BGBUILD-148
+    def recreate_rpm_database(guestfs, guestfs_helper)
+      @log.debug "Recreating RPM database..."
+
+      guestfs.download("/var/lib/rpm/Packages", "#{@dir.tmp}/Packages")
+      @exec_helper.execute("/usr/lib/rpm/rpmdb_dump #{@dir.tmp}/Packages > #{@dir.tmp}/Packages.dump")
+      guestfs.upload("#{@dir.tmp}/Packages.dump", "/tmp/Packages.dump")
+      guestfs.sh("rm -rf /var/lib/rpm/*")
+      guestfs_helper.sh("cd /var/lib/rpm/ && cat /tmp/Packages.dump | /usr/lib/rpm/rpmdb_load Packages")
+      guestfs_helper.sh("rpm --rebuilddb")
+
+      @log.debug "RPM database recreated..."
+    end
+
     def cleanup_after_appliance_creator(pid)
       @log.debug "Sending TERM signal to process '#{pid}'..."
       Process.kill("TERM", pid)