boxgrinder-build 0.9.0 → 0.9.1

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

@@ -30,49 +30,6 @@ module BoxGrinder
       @exec_helper = options[:exec_helper] || ExecHelper.new(:log => @log)
     end
 
-    def mount_image(disk, mount_dir)
-      offsets = calculate_disk_offsets(disk)
-
-      @log.debug "Mounting image #{File.basename(disk)} in #{mount_dir}..."
-      FileUtils.mkdir_p(mount_dir)
-
-      mounts = {}
-
-      offsets.each do |offset|
-        loop_device = get_loop_device
-        @exec_helper.execute("losetup -o #{offset.to_s} #{loop_device} '#{disk}'")
-        label = @exec_helper.execute("e2label #{loop_device}").strip.chomp.gsub('_', '')
-        label = '/' if label == ''
-        mounts[label] = loop_device
-      end
-
-      @exec_helper.execute("mount #{mounts['/']} '#{mount_dir}'")
-
-      mounts.reject { |key, value| key == '/' }.each do |mount_point, loop_device|
-        @exec_helper.execute("mount #{loop_device} '#{mount_dir}#{mount_point}'")
-      end
-
-      # Give some time to mount the images
-      sleep 2
-
-      @log.trace "Mounts:\n#{mounts}"
-
-      mounts
-    end
-
-    def umount_image(disk, mount_dir, mounts)
-      @log.debug "Unmounting image '#{File.basename(disk)}'..."
-
-      mounts.each { |mount_point, loop_device| @exec_helper.execute("umount -d #{loop_device}") unless mount_point == '/' }
-
-      @exec_helper.execute("umount -d #{mounts['/']}")
-
-      # Give some time to umount the image
-      sleep 2
-
-      FileUtils.rm_rf(mount_dir)
-    end
-
     def disk_info(disk)
       YAML.load(@exec_helper.execute("qemu-img info '#{disk}'"))
     end
@@ -100,63 +57,75 @@ module BoxGrinder
       end
     end
 
-    def get_loop_device
-      begin
-        loop_device = @exec_helper.execute("losetup -f 2>&1").strip
-      rescue
-        raise "No free loop devices available, please free at least one. See 'losetup -d' command."
-      end
+    # Synchronizes filesystem from one image with an empty disk image.
+    # Input image can be a partioned image or a partition image itself.
+    # Output disk is a partition image.
+    #
+    # See also https://bugzilla.redhat.com/show_bug.cgi?id=690819
+    #
+    def sync_filesystem(guestfs, guestfs_helper)
+      devices = guestfs.list_devices
+      in_device = devices.first
+      out_device = devices.last
+      partitions = guestfs.list_partitions.reject { |i| !(i =~ /^#{in_device}/) }
 
-      loop_device
-    end
+      @log.debug "Loading SELinux policy to sync filesystem..."
+      partitions.size > 0 ? guestfs_helper.mount_partitions(in_device) : guestfs_helper.mount_partition(in_device, '/')
+      guestfs_helper.load_selinux_policy
+      partitions.size > 0 ? guestfs_helper.umount_partitions(in_device) : guestfs_helper.umount_partition(in_device)
+      @log.debug "SELinux policy was loaded, we're ready to sync filesystem."
+
+      @log.info "Synchronizing filesystems..."
+
+      # Create mount points in libguestfs
+      guestfs.mkmountpoint('/in')
+      guestfs.mkmountpoint('/out')
+      guestfs.mkmountpoint('/out/in')
+
+      # Create filesystem on EC2 disk
+      guestfs.mkfs(@appliance_config.default_filesystem_type, out_device)
+      # Set root partition label
+      guestfs.set_e2label(out_device, '79d3d2d4') # This is a CRC32 from /
+
+      # Mount empty EC2 disk to /out
+      guestfs_helper.mount_partition(out_device, '/out/in')
+      partitions.size > 0 ? guestfs_helper.mount_partitions(in_device, '/in') : guestfs_helper.mount_partition(in_device, '/in')
+
+      @log.debug "Copying files..."
+
+      # Copy the filesystem
+      guestfs.cp_a('/in/', '/out')
+
+      @log.debug "Files copied."
 
-    def calculate_disk_offsets(disk)
-      @log.debug "Calculating offsets for '#{File.basename(disk)}' disk..."
-      loop_device = get_loop_device
+      # Better make sure...
+      guestfs.sync
 
-      @exec_helper.execute("losetup #{loop_device} '#{disk}'")
-      offsets = @exec_helper.execute("parted #{loop_device} 'unit B print' | grep -e '^ [0-9]' | awk '{ print $2 }'").scan(/\d+/)
-      # wait one secont before freeing loop device
-      sleep 1
-      @exec_helper.execute("losetup -d #{loop_device}")
+      guestfs_helper.umount_partition(out_device)
+      partitions.size > 0 ? guestfs_helper.umount_partitions(in_device) : guestfs_helper.umount_partition(in_device)
 
-      @log.trace "Offsets:\n#{offsets}"
+      guestfs.rmmountpoint('/out/in')
+      guestfs.rmmountpoint('/out')
+      guestfs.rmmountpoint('/in')
 
-      offsets
+      @log.info "Filesystems synchronized."
+
+      # Remount the destination disk
+      guestfs_helper.mount_partition(out_device, '/')
     end
 
     def create_disk(disk, size)
       @log.trace "Preparing disk..."
-      @exec_helper.execute "dd if=/dev/zero of='#{disk}' bs=1 count=0 seek=#{size * 1024}M"
+      @exec_helper.execute "dd if=/dev/zero of='#{disk}' bs=1 count=0 seek=#{(size * 1024).to_i}M"
       @log.trace "Disk prepared"
     end
 
-    def create_filesystem(loop_device, options = {})
+    def customize(disks, options = {})
       options = {
-          :type => @appliance_config.hardware.partitions['/']['type'],
-          :label => '/'
+          :ide_disk => ((@appliance_config.os.name == 'rhel' or @appliance_config.os.name == 'centos') and @appliance_config.os.version == '5') ? true : false
       }.merge(options)
 
-      @log.trace "Creating filesystem..."
-
-      case options[:type]
-        when 'ext3', 'ext4'
-          @exec_helper.execute "mke2fs -T #{options[:type]} -L '#{options[:label]}' -F #{loop_device}"
-        else
-          raise "Unsupported filesystem specified: #{options[:type]}"
-      end
-
-      @log.trace "Filesystem created"
-    end
-
-    def sync_files(from_dir, to_dir)
-      @log.debug "Syncing files between #{from_dir} and #{to_dir}..."
-      @exec_helper.execute "rsync -Xura #{from_dir.gsub(' ', '\ ')}/* '#{to_dir}'"
-      @log.debug "Sync finished."
-    end
-
-    def customize(disk_path)
-      GuestFSHelper.new(disk_path, :log => @log).customize(:ide_disk => ((@appliance_config.os.name == 'rhel' or @appliance_config.os.name == 'centos') and @appliance_config.os.version == '5') ? true : false) do |guestfs, guestfs_helper|
+      GuestFSHelper.new(disks, @appliance_config, @config, :log => @log).customize(options) do |guestfs, guestfs_helper|
         yield guestfs, guestfs_helper
       end
     end

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

@@ -20,13 +20,33 @@ require 'boxgrinder-core/helpers/log-helper'
 
 module BoxGrinder
   class LinuxHelper
-    def initialize( options = {} )
+    def initialize(options = {})
       @log = options[:log] || LogHelper.new
     end
 
-    def kernel_version( guestfs )
+    # Returns valid array of sorted mount points
+    #
+    # ['/', '/home'] => ['/', '/home']
+    # ['/tmp-eventlog', '/', '/ubrc', '/tmp-config'] => ['/', '/ubrc', '/tmp-config', '/tmp-eventlog']
+    #
+    def partition_mount_points(partitions)
+      partitions.keys.sort do |a, b|
+        if a.count('/') > b.count('/')
+          v = 1
+        else
+          if a.count('/') < b.count('/')
+            v = -1
+          else
+            v = a.length <=> b.length
+          end
+        end
+        v
+      end
+    end
+
+    def kernel_version(guestfs)
       kernel_versions = guestfs.ls("/lib/modules")
-      version         = kernel_versions.last
+      version = kernel_versions.last
 
       if kernel_versions.size > 1
         kernel_versions.each do |v|
@@ -40,19 +60,19 @@ module BoxGrinder
       version
     end
 
-    def kernel_image_name( guestfs )
+    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 )
+    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}" }
+        modules.each { |mod| drivers_argument << " --preload=#{mod}" }
 
         command = "/sbin/mkinitrd -f -v#{drivers_argument}"
       end
@@ -60,7 +80,7 @@ module BoxGrinder
       @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}" )
+      guestfs.sh("#{command} /boot/#{kernel_image_name}-#{kernel_version}.img #{kernel_version}")
       @log.debug "Kernel image recreated."
     end
   end

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

@@ -24,6 +24,7 @@ require 'boxgrinder-build/plugins/delivery/s3/s3-plugin'
 require 'boxgrinder-build/plugins/delivery/sftp/sftp-plugin'
 require 'boxgrinder-build/plugins/delivery/ebs/ebs-plugin'
 require 'boxgrinder-build/plugins/delivery/local/local-plugin'
+require 'boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin'
 
 require 'boxgrinder-build/plugins/platform/vmware/vmware-plugin'
 require 'boxgrinder-build/plugins/platform/ec2/ec2-plugin'

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

@@ -19,6 +19,7 @@
 require 'rubygems'
 require 'boxgrinder-core/helpers/exec-helper'
 require 'boxgrinder-core/helpers/log-helper'
+require 'boxgrinder-core/errors'
 require 'boxgrinder-build/helpers/image-helper'
 require 'boxgrinder-build/managers/plugin-manager'
 require 'ostruct'
@@ -41,7 +42,7 @@ module BoxGrinder
       @config = config
       @appliance_config = appliance_config
       @options = options
-      @log = options[:log] || Logger.new(STDOUT)
+      @log = options[:log] || LogHelper.new
       @exec_helper = options[:exec_helper] || ExecHelper.new(:log => @log)
       @image_helper = options[:image_helper] || ImageHelper.new(@config, @appliance_config, :log => @log)
       @previous_plugin_info = options[:previous_plugin_info]
@@ -111,7 +112,7 @@ module BoxGrinder
       more_info = doc.nil? ? '' : "See #{doc} for more info"
 
       fields.each do |field|
-        raise "Please specify a valid '#{field}' key in BoxGrinder configuration file: '#{@config.file}' or use CLI '--#{@plugin_info[:type]}-config #{field}:DATA' argument. #{more_info}" if @plugin_config[field].nil?
+        raise PluginValidationError, "Please specify a valid '#{field}' key in BoxGrinder configuration file: '#{@config.file}' or use CLI '--#{@plugin_info[:type]}-config #{field}:DATA' argument. #{more_info}" if @plugin_config[field].nil?
       end
     end
 

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

@@ -43,12 +43,9 @@ module BoxGrinder
     }
 
     def after_init
-      begin
+      if valid_platform?
         @current_avaibility_zone = open('http://169.254.169.254/latest/meta-data/placement/availability-zone').string
         @region = @current_avaibility_zone.scan(/((\w+)-(\w+)-(\d+))/).flatten.first
-      rescue
-        @current_avaibility_zone = nil
-        @region = nil
       end
 
       set_default_config_value('availability_zone', @current_avaibility_zone)
@@ -113,42 +110,17 @@ module BoxGrinder
       # wait for volume to be attached
       wait_for_volume_status('in-use', volume_id)
 
-      sleep 5 # let's wait to discover the attached volume by OS 
+      sleep 10 # let's wait to discover the attached volume by OS
 
       @log.info "Copying data to EBS volume..."
 
-      ec2_disk_mount_dir = "#{@dir.tmp}/ec2-#{rand(9999999999).to_s.center(10, rand(9).to_s)}"
-      ebs_disk_mount_dir = "#{@dir.tmp}/ebs-#{rand(9999999999).to_s.center(10, rand(9).to_s)}"
-
-      FileUtils.mkdir_p(ec2_disk_mount_dir)
-      FileUtils.mkdir_p(ebs_disk_mount_dir)
+      @image_helper.customize([@previous_deliverables.disk, device_for_suffix(suffix)], :automount => false) do |guestfs, guestfs_helper|
+        @image_helper.sync_filesystem(guestfs, guestfs_helper)
 
-      begin
-        ec2_mounts = @image_helper.mount_image(@previous_deliverables.disk, ec2_disk_mount_dir)
-      rescue => e
-        @log.debug e
-        raise "Error while mounting image. See logs for more info"
+        @log.debug "Adjusting /etc/fstab..."
+        adjust_fstab(guestfs)
       end
 
-      @log.debug "Creating filesystem on volume..."
-
-      @image_helper.create_filesystem(device_for_suffix(suffix))
-      @exec_helper.execute("mount #{device_for_suffix(suffix)} #{ebs_disk_mount_dir}")
-
-      @log.debug "Syncing files..."
-
-      @image_helper.sync_files(ec2_disk_mount_dir, ebs_disk_mount_dir)
-
-      @log.debug "Adjusting /etc/fstab..."
-
-      adjust_fstab(ebs_disk_mount_dir)
-
-      @exec_helper.execute("umount #{ebs_disk_mount_dir}")
-      @image_helper.umount_image(@previous_deliverables.disk, ec2_disk_mount_dir, ec2_mounts)
-
-      FileUtils.rm_rf(ebs_disk_mount_dir)
-      FileUtils.rm_rf(ec2_disk_mount_dir)
-
       @log.debug "Detaching EBS volume..."
 
       @ec2.detach_volume(:device => "/dev/sd#{suffix}", :volume_id => volume_id, :instance_id => instance_id)
@@ -228,9 +200,9 @@ module BoxGrinder
       false
     end
 
-    def adjust_fstab(ebs_mount_dir)
-      @exec_helper.execute("cat #{ebs_mount_dir}/etc/fstab | grep -v '/mnt' | grep -v '/data' | grep -v 'swap' > #{ebs_mount_dir}/etc/fstab.new")
-      @exec_helper.execute("mv #{ebs_mount_dir}/etc/fstab.new #{ebs_mount_dir}/etc/fstab")
+    def adjust_fstab(guestfs)
+      guestfs.sh("cat /etc/fstab | grep -v '/mnt' | grep -v '/data' | grep -v 'swap' > /etc/fstab.new")
+      guestfs.mv("/etc/fstab.new", "/etc/fstab")
     end
 
     def wait_for_snapshot_status(status, snapshot_id)
@@ -255,7 +227,7 @@ module BoxGrinder
       return "/dev/sd#{suffix}" if File.exists?("/dev/sd#{suffix}")
       return "/dev/xvd#{suffix}" if File.exists?("/dev/xvd#{suffix}")
 
-      raise "Not found device for suffix #{suffix}"
+      raise "Device for suffix '#{suffix}' not found!"
     end
 
     def free_device_suffix
@@ -268,13 +240,12 @@ module BoxGrinder
 
     def valid_platform?
       begin
-        open("http://169.254.169.254/1.0/meta-data/local-ipv4")
-        true
-      rescue
+        return Resolv.getname("169.254.169.254").include?(".ec2.internal")
+      rescue Resolv::ResolvError
         false
       end
     end
   end
 end
 
-plugin :class => BoxGrinder::EBSPlugin, :type => :delivery, :name => :ebs, :full_name  => "Elastic Block Storage"
+plugin :class => BoxGrinder::EBSPlugin, :type => :delivery, :name => :ebs, :full_name => "Elastic Block Storage"

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

@@ -0,0 +1,209 @@
+#
+# Copyright 2010 Red Hat, Inc.
+#
+# 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 3 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 'boxgrinder-build/plugins/base-plugin'
+require 'restclient'
+require 'zlib'
+require 'cgi'
+
+module BoxGrinder
+  class ElasticHostsPlugin < BasePlugin
+    def after_init
+      set_default_config_value('chunk', 64) # chunk size in MB
+      set_default_config_value('start_part', 0) # part number to start uploading
+      set_default_config_value('wait', 5) # wait time before retrying upload
+      set_default_config_value('retry', 3) # number of retries
+      set_default_config_value('ssl', false) # use SSL?
+      set_default_config_value('drive_name', @appliance_config.name)
+    end
+
+    def execute(type = :elastichosts)
+      validate_plugin_config(['endpoint', 'username', 'password'], 'http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#ElasticHosts_Delivery_Plugin')
+
+      raise PluginValidationError, "You can use ElasticHosts plugin with base appliances (appliances created with operating system plugins) only, see http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#ElasticHosts_Delivery_Plugin." unless @previous_plugin_info[:type] == :os
+
+      upload
+      create_server
+    end
+
+    def disk_size
+      size = 0
+      @appliance_config.hardware.partitions.each_value { |partition| size += partition['size'] }
+      size
+    end
+
+    def hash_to_request(h)
+      body = ""
+
+      h.each do |k, v|
+        body << "#{k} #{v.to_s}\n"
+      end
+
+      body
+    end
+
+    def response_to_hash(r)
+      h = {}
+
+      r.each_line do |l|
+        h[$1] = $2 if l =~ /(\w+) (.*)/
+      end
+
+      h
+    end
+
+    def create_remote_disk
+      size = disk_size
+
+      @log.info "Creating new #{size} GB disk..."
+
+
+      body = hash_to_request(
+          'size' => size * 1024 *1024 * 1024,
+          'name' => @plugin_config['drive_name']
+      )
+
+      begin
+        ret = response_to_hash(RestClient.post(api_url('/drives/create'), body))
+
+
+        @log.info "Disk created with UUID: #{ret['drive']}."
+      rescue => e
+        @log.error e.info
+        raise PluginError, "An error occured while creating the drive, #{e.message}. See logs for more info."
+      end
+
+      ret['drive']
+    end
+
+    def api_url(path)
+      "#{@plugin_config['ssl'] ? 'https' : 'http'}://#{CGI.escape(@plugin_config['username'])}:#{@plugin_config['password']}@#{@plugin_config['endpoint']}#{path}"
+    end
+
+    def upload
+      @log.info "Uploading appliance..."
+
+      # Create the disk with specific size or use already existing
+      @plugin_config['drive_uuid'] = create_remote_disk unless @plugin_config['drive_uuid']
+
+      upload_chunks
+
+      @log.info "Appliance uploaded."
+    end
+
+    def upload_chunks
+      @step = @plugin_config['chunk'] * 1024 * 1024 # in bytes
+      part = @plugin_config['start_part']
+
+      @log.info "Uploading disk in #{disk_size * 1024 / @plugin_config['chunk']} parts."
+
+      File.open(@previous_deliverables.disk, 'rb') do |f|
+        while !f.eof?
+          f.seek(part * @step, File::SEEK_SET)
+
+          data = compress(f.read(@step))
+          upload_chunk(data, part)
+
+          part += 1
+        end
+      end
+
+      @log.info "Appliance #{@appliance_config.name} uploaded to drive with UUID #{@plugin_config['drive_uuid']}."
+    end
+
+    def compress(data)
+      @log.trace "Compressing #{data.size / 1024} kB chunk of data..."
+
+      io = StringIO.new
+
+      writer = Zlib::GzipWriter.new(io, Zlib::DEFAULT_COMPRESSION, Zlib::FINISH)
+      writer.write(data)
+      writer.close
+
+      @log.trace "Data compressed to #{io.size / 1024} kB."
+
+      io.string
+    end
+
+    def upload_chunk(data, part)
+      try = 1
+
+      url = api_url("/drives/#{@plugin_config['drive_uuid']}/write/#{@step * part}")
+
+      begin
+        @log.info "Uploading part #{part+1}..."
+
+        RestClient.post url,
+                        data,
+                        :content_type => "application/octet-stream",
+                        'Content-Encoding' => 'gzip'
+
+        @log.info "Part #{part+1} uploaded."
+      rescue => e
+        @log.warn "An error occured while uploading #{part} chunk, #{e.message}"
+        try += 1
+
+        unless try > @plugin_config['retry']
+          # Let's sleep for specified amount of time
+          sleep @plugin_config['wait']
+          retry
+        else
+          @log.error e.info
+          raise PluginError, "Couldn't upload appliance, #{e.message}."
+        end
+      end
+    end
+
+    def is_cloudsigma?
+      !@plugin_config['endpoint'].match(/cloudsigma\.com$/).nil?
+    end
+
+    # Creates the server for previously uploaded disk
+    def create_server
+      @log.info "Creating new server..."
+
+      memory = ((is_cloudsigma? and @appliance_config.hardware.memory < 512) ? 512 : @appliance_config.hardware.memory)
+
+      body = hash_to_request(
+          'name' => "#{@appliance_config.name}-#{@appliance_config.version}.#{@appliance_config.release}",
+          'cpu' => @appliance_config.hardware.cpus * 1000, # MHz
+          'smp' => 'auto',
+          'mem' => memory,
+          'persistent' => 'true', # hack
+          'ide:0:0' => @plugin_config['drive_uuid'],
+          'boot' => 'ide:0:0',
+          'nic:0:model' => 'e1000',
+          'nic:0:dhcp' => 'auto',
+          'vnc:ip' => 'auto',
+          'vnc:password' => (0...8).map { (('a'..'z').to_a + ('A'..'Z').to_a)[rand(52)] }.join # 8 character VNC password
+      )
+
+      begin
+        path = is_cloudsigma? ? '/servers/create' : '/servers/create/stopped'
+        ret = response_to_hash(RestClient.post(api_url(path), body))
+
+        @log.info "Server was registered with '#{ret['name']}' name as '#{ret['server']}' UUID. Use web UI or API tools to start your server."
+      rescue => e
+        @log.error e.info
+        raise PluginError, "An error occured while creating the server, #{e.message}. See logs for more info."
+      end
+    end
+  end
+end
+
+plugin :class => BoxGrinder::ElasticHostsPlugin, :type => :delivery, :name => :elastichosts, :full_name => "ElasticHosts"

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

@@ -49,13 +49,17 @@ module BoxGrinder
       packages << '@core'
       packages << "system-config-firewall-base"
       packages << "dhclient"
-      
-      # kernel_PAE for 32 bit, kernel for 64 bit
+
       packages.delete('kernel')
       packages.delete('kernel-PAE')
-      packages << (@appliance_config.is64bit? ? "kernel" : "kernel-PAE")
+
+      if @appliance_config.is64bit?
+        packages << "kernel"
+      else
+        @appliance_config.os.pae ? packages << "kernel-PAE" : packages << "kernel"
+      end
     end
   end
 end
 
-plugin :class => BoxGrinder::FedoraPlugin, :type => :os, :name => :fedora, :full_name  => "Fedora", :versions   => ["13", "14", "15", "rawhide"]
+plugin :class => BoxGrinder::FedoraPlugin, :type => :os, :name => :fedora, :full_name => "Fedora", :versions => ["13", "14", "15", "rawhide"]

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

@@ -26,8 +26,6 @@ module BoxGrinder
     end
 
     def build_rhel(appliance_definition_file, repos = {})
-      adjust_partition_table
-
       normalize_packages(@appliance_config.packages)
 
       build_with_appliance_creator(appliance_definition_file, repos) do |guestfs, guestfs_helper|
@@ -53,11 +51,6 @@ module BoxGrinder
       package_array.each { |package| packages << package unless packages.include?(package) }
     end
 
-    # https://bugzilla.redhat.com/show_bug.cgi?id=466275
-    def adjust_partition_table
-      @appliance_config.hardware.partitions['/boot'] = {'root' => '/boot', 'type' => 'ext3', 'size' => 0.1} if @appliance_config.hardware.partitions['/boot'].nil?
-    end
-
     def execute(appliance_definition_file)
       build_rhel(appliance_definition_file)
     end

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

@@ -19,6 +19,7 @@
 require 'fileutils'
 require 'yaml'
 require 'erb'
+require 'zlib'
 
 module BoxGrinder
 
@@ -30,6 +31,8 @@ module BoxGrinder
       @dir              = dir
       @log              = options[:log] || Logger.new(STDOUT)
 
+      @linux_helper     = LinuxHelper.new(:log => @log)
+
       @kickstart_file   = "#{@dir.tmp}/#{@appliance_config.name}.ks"
     end
 
@@ -54,7 +57,7 @@ module BoxGrinder
 
       cost = 40
 
-      definition['partitions'] = @appliance_config.hardware.partitions
+      definition['mount_points'] = @linux_helper.partition_mount_points(@appliance_config.hardware.partitions)
 
       repos = []
       repos += default_repos if @appliance_config.default_repos