boxgrinder-build 0.9.0 → 0.9.1

data/CHANGELOG

@@ -1,3 +1,14 @@
+v0.9.1
+
+* [BGBUILD-188] Use libuestfs instead mounting partitions manually for EC2 appliances
+* [BGBUILD-97] some filesystems dont get unmounted on BG interruption
+* [BGBUILD-155] Images built on Centos5.x (el5) for VirtualBox kernel panic (/dev/root missing)
+* [BGBUILD-190] Allow to specify kernel variant (PAE or not) for Fedora OS
+* [BGBUILD-196] GuestFS fails mounting partitions where more then 3 partitions are present
+* [BGBUILD-200] /sbin/e2label: Filesystem has unsupported feature(s) while trying to open /dev/sda1
+* [BGBUILD-194] Add support for ElasticHosts cloud
+* [BGBUILD-202] Unable to get valid context for ec2-user after login on AMI
+
 v0.9.0
 
 * [BGBUILD-174] Move plugins to boxgrinder-build gem

data/README.md

@@ -1,31 +1,31 @@
 # BoxGrinder
 
-BoxGrinder is a set of projects that help you grind out appliances for multiple virtualization and Cloud providers. 
+BoxGrinder is a set of projects that help you grind out appliances for multiple virtualization and Cloud providers.
 
-Visit us at [boxgrinder.org](http://www.boxgrinder.org)
+Visit us at [boxgrinder.org](http://www.boxgrinder.org), or join #boxgrinder on irc.freenode.net
 
 ## BoxGrinder Build
 
-BoxGrinder Build is a command line tool to help you build appliances. With an appliance definition and just a single command, BoxGrinder can create your appliance, target it to a platform and deliver it.   
+BoxGrinder Build is a command line tool to help you build appliances. With an appliance definition and just a single command, BoxGrinder can create your appliance, target it to a platform and deliver it.
 
-### Boxgrinder Build Meta Appliance: Boxgrinder the Easy Way
+### Boxgrinder Build Meta Appliance: BoxGrinder the Easy Way
 
-The Boxgrinder Meta appliance is pre-configured with an optimal environment prepared to use Boxgrinder right from launch. Just [download the latest appliance](http://boxgrinder.org/download/boxgrinder-build-meta-appliance/) from boxgrinder.org in your desired format, launch it, and you're ready to grind out images!
+The BoxGrinder Meta appliance is pre-configured with an optimal environment prepared to use BoxGrinder right from launch. Just [download the latest appliance](http://boxgrinder.org/download/boxgrinder-build-meta-appliance/) from boxgrinder.org in your desired format, launch it, and you're ready to grind out images!
 
 It is a great way to use or test BoxGrinder in a virtual environment without affecting your local system.
 
-Visit the [Boxgrinder Meta appliance usage article](http://boxgrinder.org/tutorials/boxgrinder-build-meta-appliance/) to learn more.
+Visit the [BoxGrinder Meta appliance usage article](http://boxgrinder.org/tutorials/boxgrinder-build-meta-appliance/) to learn more.
 
 ### Supported OSes
 
 At present the project officially supports the following OSes in x86_64 and i386 variants:
 
-* Fedora (13, 14)
+* Fedora (13, 14, 15)
 * RHEL (5.x, 6.x) and CentOS (5.x)
 
 ### Requirements
 
-* Acquiring and installing BoxGrinder is very simple, with RPMs ensuring the correct dependencies are pulled and installed.  However, depending upon your OS of choice, the prerequisites for installing BoxGrinder vary slightly. 
+* Acquiring and installing BoxGrinder is very simple, with RPMs ensuring the correct dependencies are pulled and installed.  However, depending upon your OS of choice, the prerequisites for installing BoxGrinder vary slightly.
 * Administrative level permissions (root or equivalent)
 
 #### Fedora
@@ -42,35 +42,35 @@ For detailed instructions, see: [Preparing your environment](http://boxgrinder.o
 
 Once the prerequisites are satisfied, install BoxGrinder via a package manager, for instance in YUM;
 
-* `sudo yum install "rubygem-boxgrinder*"` to install BoxGrinder Core, BoxGrinder Build and all standard plugins.
-
-You may only wish to install a subset of the available plugins, see the [BoxGrinder plugins list](http://boxgrinder.org/tutorials/#Plugin_list) to find out which are available.  You can, of course, [write your own](http://boxgrinder.org/tutorials/how-to-write-a-plugin-for-boxgrinder-build/) plugins!
+* `sudo yum install rubygem-boxgrinder-build` to install BoxGrinder Build.
 
 ### Removing
 
 You should remove BoxGrinder through your system package manager, for instance with YUM:
 
-* `sudo yum remove "rubygem-boxgrinder*"`
+* `sudo yum remove rubygem-boxgrinder*`
 
 ### Usage
 
-BoxGrinder.org's [quick-start](http://boxgrinder.org/tutorials/boxgrinder-build-quick-start/) tutorial is the best place to learn the fundamentals of BoxGrinder Build, enabling you to rapidly leverage the feature-set on offer.  
+BoxGrinder.org's [quick-start](http://boxgrinder.org/tutorials/boxgrinder-build-quick-start/) tutorial is the best place to learn the fundamentals of BoxGrinder Build, enabling you to rapidly leverage the feature-set on offer.
 
-The following sections provide a basic overview of functionality. 
+The following sections provide a basic overview of functionality.
 
 ### Plugins
 
-Most of the features of BoxGrinder Build are provided through plugins, with three primary variants (Operating System, Platform and Delivery), each catering for a phase of the build process.  Furthermore, the flexible and extensible structure of BoxGrinder Build enables users to seamlessly add new features and functionality.
+Most of the features of BoxGrinder Build are provided through plugins, with three primary variants (Operating System, Platform and Delivery), each catering for a phase of the build process. Furthermore, the flexible and extensible structure of BoxGrinder Build enables users to seamlessly add new features and functionality.
+
+As of version 0.9.0 BoxGrinder Build is distributed with [standard plugins](http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#Plugin_introduction) installed by default.
 
 * Operating System - provide support to run and build for a given OS
 * Platform - ability to produce appliances for a specific platform, such as Amazon's EC2 or VirtualBox VM
 * Delivery - send the completed appliance, for instance by SFTP or bundled as an AMI and uploaded to S3.
 
-Learn more: [BoxGrinder Build](http://boxgrinder.org/build/)
+Learn more: [BoxGrinder Build](http://boxgrinder.org/build/), [BoxGrinder Plugins](http://boxgrinder.org/tutorials/boxgrinder-build-plugins/)
 
 #### Plugin Configuration
 
-Many plugins allow, or mandate, some degree of configuration before they are executed.  These properties are aggregated into a single per-user configuration file, at `~/.boxgrinder/config`.  The user should consult the documentation of a given plugin to determine what fields it should be configured with, and which fields (if any), are requisite. 
+Many plugins allow, or mandate, some degree of configuration before they are executed.  These properties are aggregated into a single per-user configuration file, at `~/.boxgrinder/config`.  The user should consult the documentation of a given plugin to determine what fields it should be configured with, and which fields (if any), are requisite.
 
     plugins:
       sftp:
@@ -80,7 +80,7 @@ Many plugins allow, or mandate, some degree of configuration before they are exe
 
 * In this example, the SFTP plugin's fields are [all mandatory](http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#SFTP_Delivery_Plugin).
 
-Learn more: [BoxGrinder Plugins](http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#Plugin_configuration) 
+Learn more: [BoxGrinder Plugins](http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#Plugin_configuration)
 
 #### Defining Appliances
 
@@ -97,40 +97,38 @@ Appliances are defined in YAML, the following "JEOS" definition can be used by B
           size: 2
     packages:
       - @core
-  
-  * With this simple definition, BoxGrinder will produce a Fedora 14 appliance with the Core [group of packages](http://yum.baseurl.org/wiki/YumGroups). You can easily add packages, repositories, and harness a plethora of powerful features in a concise, declarative manner. 
-  * For an introduction to Appliance Definitions, see: [Quick-start, building your first appliance](http://boxgrinder.org/tutorials/boxgrinder-build-quick-start/build-your-first-appliance) 
+
+  * With this simple definition, BoxGrinder will produce a Fedora 14 appliance with the Core [group of packages](http://yum.baseurl.org/wiki/YumGroups). You can easily add packages, repositories, and harness a plethora of powerful features in a concise, declarative manner.
+  * For an introduction to Appliance Definitions, see: [Quick-start, building your first appliance](http://boxgrinder.org/tutorials/boxgrinder-build-quick-start/build-your-first-appliance)
   * For fuller explanations of all parameters BoxGrinder offers, see: [Appliance definition parameters](http://boxgrinder.org/tutorials/appliance-definition/)
-  
+
 #### Building Appliances
-The BoxGrinder Build CLI is a simple interface through which you can instruct BoxGrinder to build your appliances. You can view a brief manual on each task by utilising the help function: 
+The BoxGrinder Build CLI is a simple interface through which you can instruct BoxGrinder to build your appliances. You can view a brief manual by using `boxgrinder-build --help`, and version information through `boxgrinder-build --version`
 
-    boxgrinder help [TASK]
+BoxGrinder Build is run with a mandatory appliance definition, along with optional platform and delivery plugin specifiers.  BoxGrinder resolves the packages and associated dependencies in the appliance definition, and installs them into the new image it generates based upon the operating system and versions specified.
 
-BoxGrinder's primary task is `build`, and is run with a mandatory appliance definition, along with optional platform and delivery plugin specifiers.  BoxGrinder resolves the packages and associated dependencies in the appliance definition, and installs them into the new image it generates based upon the operating system and versions specified.
+    boxgrinder-build [appliance definition file] [options]
 
-    boxgrinder build [appliance definition file] [options]
-    
  * The two most common options are `[-p|--platform=]` and `[-d|--delivery=]`. Neither is mandatory, if platform is omitted then only the raw KVM image is created. You can can later return and target a build to different platforms, and BoxGrinder will always reuse the intermediary data where it is available. If you wish to force a rebuild, you can use the `[-f|--force]` flag.
  * It is possible to manually provide key-value pairs for platform and delivery plugin configuration on the command line. These will override any pre-existing plugin parameters set in the BoxGrinder config file.
- * Shell commands can be executed in `post` sections of the appliance definition files, which is useful for basic configuration. However, it is advisable that more complex configuration and installation of custom software is performed properly through RPM files. This is often best achieved through local repositories, which can be configured as [_ephemeral_](http://boxgrinder.org/tutorials/appliance-definition/) in order to avoid the repository being installed into the resultant image's package manager. 
- 
-See: [BoxGrinder Build Usage Instructions](http://boxgrinder.org/tutorials/boxgrinder-build-usage-instructions/), [How to use local repositories](http://boxgrinder.org/tutorials/how-to-use-local-repository), and `boxgrinder help build` 
+ * Shell commands can be executed in `post` sections of the appliance definition files, which is useful for basic configuration. However, it is advisable that more complex configuration and installation of custom software is performed properly through RPM files. This is often best achieved through local repositories, which can be configured as [_ephemeral_](http://boxgrinder.org/tutorials/appliance-definition/) in order to avoid the repository being installed into the resultant image's package manager.
+
+See: [BoxGrinder Build Usage Instructions](http://boxgrinder.org/tutorials/boxgrinder-build-usage-instructions/), [How to use local repositories](http://boxgrinder.org/tutorials/how-to-use-local-repository)
 
 ##### Examples
 
-    boxgrinder build fedora-14.appl -p vmware -d sftp
+    boxgrinder-build fedora-14.appl -p vmware -d sftp
 
 Build an image based upon _fedora-14.appl_, and produce an image targeted at the _vmware_ platform.  Once complete, deliver by _sftp_. Note that each of these plugins must be configured in `~/.boxgrinder/conf` or by providing the key-value pairs as command-line arguments.
 
 -----------------------
 
-    boxgrinder build fedora-14.appl -p virtualbox -d local
+    boxgrinder-build fedora-14.appl -p virtualbox -d local
 
 Assuming that BoxGrinder had succeeded in building the prior image, the RAW file is again used as an intermediary without needing to be rebuild. An image targeted at VirtualBox is then produced, and delivered to a local file, as determined in _conf_.
 
 -----------------------
 
     setarch i386 boxgrinder build fedora-14.appl
-    
-Build an i386 appliance (on an x86_64 machine).    
+
+Build an i386 appliance (on an x86_64 machine).

data/Rakefile

@@ -17,7 +17,12 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
-require 'spec/rake/spectask'
+
+begin
+  require 'rake/dsl'
+rescue LoadError
+end
+
 require 'echoe'
 
 Echoe.new("boxgrinder-build") do |p|
@@ -31,6 +36,7 @@ Echoe.new("boxgrinder-build") do |p|
       'aws', # S3
       'amazon-ec2', # EBS and S3
       'net-sftp', 'net-ssh', 'progressbar', # SFTP
+      'rest-client' # ElasticHosts
   ]
 end
 

data/bin/boxgrinder-build

@@ -32,15 +32,10 @@ end
 options = OpenCascade.new(
     :platform => :none,
     :delivery => :none,
-    :force => false,
     :os_config => {},
     :platform_config => {},
     :delivery_config => {},
-    :additional_plugins => [],
-    :debug => false,
-    :trace => false,
-    :backtrace => false,
-    :log_level => :info
+    :additional_plugins => []
 )
 
 def validate_hash_option(options, name, value)
@@ -130,8 +125,8 @@ EOB
     opts.separator ""
     opts.separator "Logging options:"
 
-    opts.on("--debug", "Prints debug information while building. Default: false.") { |v| options[:debug] = v }
-    opts.on("--trace", "Prints trace information while building. Default: false.") { |v| options[:trace] = v }
+    opts.on("--debug", "Prints debug information while building. Default: false.") { options[:log_level] = :debug }
+    opts.on("--trace", "Prints trace information while building. Default: false.") { options[:log_level] = :trace }
     opts.on("-b", "--backtrace", "Prints full backtrace if errors occur whilst building. Default: true if console log is set to debug or trace, otherwise false.") { |v| options[:backtrace] = v }
 
     opts.separator ""
@@ -175,20 +170,18 @@ begin
     abort
   end
 
-  options.log_level = :debug if options.debug
-  options.log_level = :trace if options.trace
-  options.backtrace = :true if [:debug, :trace].include?(options.log_level)
-
-  log = BoxGrinder::LogHelper.new(:level => options.log_level)
+  config = BoxGrinder::Config.new(options)
+  log = BoxGrinder::LogHelper.new(:level => config.log_level)
 
   begin
-    BoxGrinder::Appliance.new(appliance_definition_file, BoxGrinder::Config.new(options), :log => log).create
+    BoxGrinder::Appliance.new(appliance_definition_file, config, :log => log).create
   rescue Exception => e
+    msg = "#{e.class}: #{e.message}#$/#{e.backtrace.join($/)}"
     if options.backtrace
-      log.fatal e
+      log.fatal msg
     else # demote backtrace to debug so that it is in file log only
-      log.fatal "#{e.message}. See the log file for detailed information."
-      log.debug e.backtrace.join($/)
+      log.fatal "#{e.class}: #{e.message}. See the log file for detailed information."
+      log.debug msg
     end
   end
 rescue => e

data/boxgrinder-build.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-03-09}
+  s.date = %q{2011-04-27}
   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/appliance-customize-helper.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/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/appliance-customize-helper.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/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/appliance-customize-helper-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/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/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.homepage = %q{http://boxgrinder.org/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-build", "--main", "README.md"]
   s.require_paths = ["lib"]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<net-sftp>, [">= 0"])
       s.add_runtime_dependency(%q<net-ssh>, [">= 0"])
       s.add_runtime_dependency(%q<progressbar>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
     else
       s.add_dependency(%q<boxgrinder-core>, ["~> 0.3.0"])
       s.add_dependency(%q<aws>, [">= 0"])
@@ -38,6 +39,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<net-sftp>, [">= 0"])
       s.add_dependency(%q<net-ssh>, [">= 0"])
       s.add_dependency(%q<progressbar>, [">= 0"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
     end
   else
     s.add_dependency(%q<boxgrinder-core>, ["~> 0.3.0"])
@@ -46,5 +48,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<net-sftp>, [">= 0"])
     s.add_dependency(%q<net-ssh>, [">= 0"])
     s.add_dependency(%q<progressbar>, [">= 0"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
   end
 end

data/lib/boxgrinder-build/appliance.rb

@@ -25,7 +25,6 @@ require 'boxgrinder-core/helpers/appliance-definition-helper'
 require 'boxgrinder-core/helpers/appliance-config-helper'
 require 'boxgrinder-build/helpers/plugin-helper'
 require 'boxgrinder-build/managers/plugin-manager'
-require 'boxgrinder-core/validators/appliance-config-validator'
 
 module BoxGrinder
   class Appliance
@@ -36,32 +35,30 @@ module BoxGrinder
     end
 
     def read_definition
-      begin
-        # first try to read as appliance definition file
-        appliance_helper = ApplianceDefinitionHelper.new(:log => @log)
-        appliance_helper.read_definitions(@appliance_definition)
-
-        appliance_configs = appliance_helper.appliance_configs
-        appliance_config = appliance_configs.first
-      rescue
-        # then try to read OS plugin specific format
+      # first try to read as appliance definition file
+      appliance_helper = ApplianceDefinitionHelper.new(:log => @log)
+      appliance_helper.read_definitions(@appliance_definition)
+
+      appliance_configs = appliance_helper.appliance_configs
+      appliance_config = appliance_configs.first
+
+      if appliance_config.nil?
+        # Still nothing? Then try to read OS plugin specific format...
         PluginManager.instance.plugins[:os].each_value do |info|
           plugin = info[:class].new
           appliance_config = plugin.read_file(@appliance_definition) if plugin.respond_to?(:read_file)
           break unless appliance_config.nil?
         end
         appliance_configs = [appliance_config]
-      end
 
-      raise "Couldn't read appliance definition file: #{File.basename(@appliance_definition)}" if appliance_config.nil?
+        raise ValidationError, "Couldn't read appliance definition file: #{File.basename(@appliance_definition)}." if appliance_config.nil?
+      end
 
       appliance_config_helper = ApplianceConfigHelper.new(appliance_configs)
       @appliance_config = appliance_config_helper.merge(appliance_config.clone.init_arch).initialize_paths
     end
 
     def validate_definition
-      ApplianceConfigValidator.new(@appliance_config).validate
-
       raise "No operating system plugins installed. Install one or more operating system plugin. See http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#Operating_system_plugins for more info." if PluginManager.instance.plugins[:os].empty?
 
       os_plugin = PluginManager.instance.plugins[:os][@appliance_config.os.name.to_sym]
@@ -84,7 +81,7 @@ module BoxGrinder
 
     def create
       @log.debug "Launching new BoxGrinder build..."
-      @log.trace "Used configuration: #{@config.to_yaml.gsub(/(\S*(key|account|cert|username|host)\S*).*:(.*)/, '\1' + ": <REDACTED>")}"
+      @log.trace "Used configuration: #{@config.to_yaml.gsub(/(\S*(key|account|cert|username|host|password)\S*).*:(.*)/, '\1' + ": <REDACTED>")}"
 
       PluginHelper.new(@config, :log => @log).load_plugins
       read_definition
@@ -101,7 +98,7 @@ module BoxGrinder
 
       if os_plugin.deliverables_exists?
         @log.info "Deliverables for #{os_plugin_info[:name]} operating system plugin exists, skipping."
-        return {:deliverables => os_plugin.deliverables}
+        return {:deliverables => os_plugin.deliverables, :plugin_info => os_plugin_info}
       end
 
       @log.debug "Executing operating system plugin for #{@appliance_config.os.name}..."

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

@@ -39,6 +39,10 @@ module BoxGrinder
       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
@@ -81,11 +85,11 @@ end
 
 module BoxGrinder
   class GuestFSHelper
-    def initialize(raw_disk, options = {})
-      @raw_disk = raw_disk
+    def initialize(disks, appliance_config, config, options = {})
+      @disks = disks
+      @appliance_config = appliance_config
+      @config = config
       @log = options[:log] || LogHelper.new
-
-      @partitions = {}
     end
 
     attr_reader :guestfs
@@ -134,10 +138,21 @@ module BoxGrinder
     end
 
     def execute(pipe = nil, options = {})
-      options = {:ide_disk => false}.merge(options)
+      options = {
+          :ide_disk => false,
+          :mount_prefix => '',
+          :automount => true,
+          :load_selinux_policy => true
+      }.merge(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)
 
       # https://bugzilla.redhat.com/show_bug.cgi?id=502058
@@ -161,13 +176,15 @@ module BoxGrinder
         end
       end
 
-      @log.trace "Adding drive '#{@raw_disk}'..."
-      if options[:ide_disk]
-        @guestfs.add_drive_with_if(@raw_disk, 'ide')
-      else
-        @guestfs.add_drive(@raw_disk)
+      @disks.each do |disk|
+        @log.trace "Adding drive '#{disk}'..."
+        if options[:ide_disk]
+          @guestfs.add_drive_with_if(disk, 'ide')
+        else
+          @guestfs.add_drive(disk)
+        end
+        @log.trace "Drive added."
       end
-      @log.trace "Drive added."
 
       if @guestfs.respond_to?('set_network')
         @log.debug "Enabling networking for GuestFS..."
@@ -177,16 +194,17 @@ module BoxGrinder
       @log.debug "Launching guestfs..."
       @guestfs.launch
 
-      case @guestfs.list_partitions.size
-        when 0
-          mount_partition(@guestfs.list_devices.first, '/')
-        when 1
-          mount_partition(@guestfs.list_partitions.first, '/')
+      if options[:automount]
+        device = @guestfs.list_devices.first
+
+        if @guestfs.list_partitions.size == 0
+          mount_partition(device, '/', options[:mount_prefix])
         else
-          mount_partitions
-      end
+          mount_partitions(device, options[:mount_prefix])
+        end
 
-      load_selinux_policy
+        load_selinux_policy if options[:load_selinux_policy]
+      end
 
       @log.trace "Guestfs launched."
 
@@ -204,10 +222,14 @@ module BoxGrinder
 
       selinux = @guestfs.aug_get("/files/etc/sysconfig/selinux/SELINUX")
 
-      @guestfs.sh("/usr/sbin/load_policy") if !selinux.nil? and !selinux.eql?('disabled')
-      @guestfs.aug_close
-
-      @log.trace "SElinux policy loaded."
+      begin
+        @guestfs.sh("/usr/sbin/load_policy") if !selinux.nil? and !selinux.eql?('disabled')
+        @log.trace "SElinux policy loaded."
+      rescue
+        @log.warn "Loading SELinux policy failed. SELinux may be not fully initialized."
+      ensure
+        @guestfs.aug_close
+      end
     end
 
     def clean_close
@@ -220,34 +242,56 @@ module BoxGrinder
       @log.trace "Guestfs closed."
     end
 
-    def mount_partition(part, mount_point)
+    def mount_partition(part, mount_point, mount_prefix = '')
       @log.trace "Mounting #{part} partition to #{mount_point}..."
-      @guestfs.mount_options("", part, mount_point)
+      @guestfs.mount_options("", part, "#{mount_prefix}#{mount_point}")
       @log.trace "Partition mounted."
     end
 
-    def mount_partitions
-      root_partition = nil
+    # This mount partitions. We assume that the first partition is a root partition.
+    #
+    def mount_partitions(device, mount_prefix = '')
+      @log.trace "Mounting partitions..."
 
-      @guestfs.list_partitions.each do |partition|
-        mount_partition(partition, '/')
+      partitions = mountable_partitions(device)
 
-        # TODO: use this http://libguestfs.org/guestfs.3.html#guestfs_vfs_label
-        if @guestfs.exists('/sbin/e2label') != 0
-          root_partition = partition
-          break
-        end
-        @guestfs.umount(partition)
-      end
+      mount_points = LinuxHelper.new(:log => @log).partition_mount_points(@appliance_config.hardware.partitions)
 
-      raise "No root partition found for '#{File.basename(@raw_disk)}' disk!" if root_partition.nil?
+      partitions.each_index do |i|
+        mount_partition(partitions[i], mount_points[i], mount_prefix)
 
-      @guestfs.list_partitions.each do |partition|
-        next if partition == root_partition
-        mount_partition(partition, @guestfs.sh("/sbin/e2label #{partition}").strip.chomp.gsub('_', ''))
+        # 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
     end
 
+    def mountable_partitions(device)
+      partitions = @guestfs.list_partitions.reject { |i| !(i =~ /^#{device}/) }
+
+      # we need to remove extended partition
+      # extended partition is always #3
+      partitions.delete_at(3) if partitions.size > 4
+
+      partitions
+    end
+
+    def umount_partition(part)
+      @log.trace "Unmounting partition #{part}..."
+      @guestfs.umount(part)
+      @log.trace "Partition unmounted."
+    end
+
+    # Unmounts partitions in reverse order.
+    #
+    def umount_partitions(device)
+      partitions = @guestfs.list_partitions.reject { |i| !(i =~ /^#{device}/) }
+
+      @log.trace "Unmounting partitions..."
+      partitions.reverse.each { |part| umount_partition(part) }
+      @log.trace "All partitions unmounted."
+    end
+
     def sh(cmd, options = {})
       arch = options[:arch] || `uname -m`.chomp.strip