boxgrinder-build 0.9.1 → 0.9.2

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

@@ -41,9 +41,6 @@ module BoxGrinder
         @image_helper.sync_filesystem(guestfs, guestfs_helper)
 
         if (@appliance_config.os.name == 'rhel' or @appliance_config.os.name == 'centos') and @appliance_config.os.version == '5'
-          # Not sure why it's messed but this prevents booting on AWS
-          recreate_journal(guestfs)
-
           # Remove normal kernel
           guestfs.sh("yum -y remove kernel")
           # because we need to install kernel-xen package
@@ -87,12 +84,6 @@ module BoxGrinder
       end
     end
 
-    def recreate_journal(guestfs)
-      @log.debug "Recreating EXT3 journal on root partition."
-      guestfs.sh("tune2fs -j #{guestfs.list_devices.first}")
-      @log.debug "Journal recreated."
-    end
-
     def create_devices(guestfs)
       return if guestfs.exists('/sbin/MAKEDEV') == 0
 

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

@@ -63,12 +63,14 @@ module BoxGrinder
 
     # returns value of cylinders, heads and sector for selected disk size (in GB)
     # http://kb.vmware.com/kb/1026254
-    def generate_scsi_chs(disk_size)
-      if disk_size < 1
+    def generate_scsi_chs
+      disk_size = File.stat(@previous_deliverables.disk).size
+
+      if disk_size < 1073741824
         h = 64
         s = 32
       else
-        if disk_size < 2
+        if disk_size < 2147483648
           h = 128
           s = 32
         else
@@ -77,9 +79,8 @@ module BoxGrinder
         end
       end
 
-      #               GB          MB     KB     B
-      c             = disk_size * 1024 * 1024 * 1024 / (h*s*512)
-      total_sectors = disk_size * 1024 * 1024 * 1024 / 512
+      c             = disk_size / (h*s*512)
+      total_sectors = disk_size / 512
 
       [c.to_i, h.to_i, s.to_i, total_sectors.to_i]
     end
@@ -87,10 +88,7 @@ module BoxGrinder
     def change_vmdk_values(type)
       vmdk_data = File.open("#{File.dirname(__FILE__)}/src/base.vmdk").read
 
-      disk_size = 0.0
-      @appliance_config.hardware.partitions.values.each { |part| disk_size += part['size'].to_f }
-
-      c, h, s, total_sectors = generate_scsi_chs(disk_size)
+      c, h, s, total_sectors = generate_scsi_chs
 
       is_enterprise = type.eql?("vmfs")
 

data/rubygem-boxgrinder-build.spec

@@ -5,7 +5,7 @@
 
 Summary: A tool for creating appliances from simple plain text files
 Name: rubygem-%{gemname}
-Version: 0.9.1
+Version: 0.9.2
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
@@ -115,7 +115,7 @@ mkdir -p %{_builddir}%{gemdir}
 mkdir -p %{buildroot}/%{_bindir}
 mkdir -p %{buildroot}/%{gemdir}
 
-gem install --local --install-dir %{_builddir}%{gemdir} \
+/usr/bin/gem install --local --install-dir %{_builddir}%{gemdir} \
             --force --rdoc %{SOURCE0}
 mv %{_builddir}%{gemdir}/bin/* %{buildroot}/%{_bindir}
 find %{_builddir}%{geminstdir}/bin -type f | xargs chmod a+x
@@ -136,6 +136,7 @@ popd
 %doc %{geminstdir}/LICENSE
 %doc %{geminstdir}/README.md
 %doc %{geminstdir}/Manifest
+%attr(755, root, root) %{geminstdir}/lib/boxgrinder-build/helpers/qemu.wrapper
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
@@ -148,7 +149,19 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
-* Thu Mar 17 2011 <mgoldman@redhat.com> - 0.9.1-1
+* Thu May 05 2011 Marek Goldmann <mgoldman@redhat.com> - 0.9.2-1
+- Upstream release: 0.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
+
+* Thu Mar 17 2011 Marek Goldmann <mgoldman@redhat.com> - 0.9.1-1
 - Upstream release: 0.9.1
 - [BGBUILD-188] Use libuestfs instead mounting partitions manually for EC2 appliances
 - [BGBUILD-97] some filesystems dont get unmounted on BG interruption
@@ -159,7 +172,7 @@ popd
 - [BGBUILD-194] Add support for ElasticHosts cloud
 - [BGBUILD-202] Unable to get valid context for ec2-user after login on AMI
 
-* Tue Mar 01 2011 <msavy@redhat.com> - 0.9.0-1
+* Tue Mar 01 2011 Marc Savy <msavy@redhat.com> - 0.9.0-1
 - Upstream release: 0.9.0
 - [BGBUILD-103] README to indicate supported operating systems / requirements
 - [BGBUILD-169] S3 plugin temporary work-around for EL5
@@ -173,13 +186,13 @@ popd
 - [BGBUILD-176] Fail the build with appropriate message if any of post section commands fails to execute
 - [BGBUILD-183] Add support for Fedora 15
 
-* Tue Feb 16 2011  <mgoldman@redhat.com> - 0.8.1-1
+* Tue Feb 16 2011 Marek Goldmann <mgoldman@redhat.com> - 0.8.1-1
 - Upstream release: 0.8.1
 - [BGBUILD-141] Long delay after "Preparing guestfs" message when creating new image
 - [BGBUILD-150] Cyclical inclusion dependencies in appliance definition files are not detected/handled
 - [BGBUILD-165] Use version in dependencies in gem and in RPM only where necessary
 
-* Tue Jan 04 2011  <mgoldman@redhat.com> - 0.8.0-1
+* Tue Jan 04 2011 Marek Goldmann <mgoldman@redhat.com> - 0.8.0-1
 - Upstream release: 0.8.0
 - Added BuildRoot tag to build for EPEL 5
 - [BGBUILD-128] Allow to specify plugin configuration using CLI
@@ -193,12 +206,12 @@ popd
 - [BGBUILD-138] enablerepo path is not escaped when calling repoquery
 - [BGBUILD-147] Allow to list installed plugins and version information
 
-* Mon Dec 20 2010  <mgoldman@redhat.com> - 0.7.1-1
+* Mon Dec 20 2010 Marek Goldmann <mgoldman@redhat.com> - 0.7.1-1
 - Upstream release: 0.7.1
 - [BGBUILD-123] Remove RPM database recreation code
 - [BGBUILD-124] Guestfs fails while mounting multiple partitions with '_' prefix
 
-* Fri Dec 17 2010  <mgoldman@redhat.com> - 0.7.0-1
+* Fri Dec 17 2010 Marek Goldmann <mgoldman@redhat.com> - 0.7.0-1
 - Updated to upstream version: 0.7.0
 - [BGBUILD-113] Allow to specify supported file formats for operating system plugin
 - [BGBUILD-73] Add support for kickstart files
@@ -206,17 +219,17 @@ popd
 - [BGBUILD-118] Enable SElinux in guestfs
 - [BGBUILD-119] Fix SElinux issues on EC2 appliances
 
-* Thu Dec 02 2010  <mgoldman@redhat.com> - 0.6.5-1
+* Thu Dec 02 2010 Marek Goldmann <mgoldman@redhat.com> - 0.6.5-1
 - Updated to new upstream release: 0.6.5
 
-* Mon Nov 22 2010  <mgoldman@redhat.com> - 0.6.4-3
+* Mon Nov 22 2010 Marek Goldmann <mgoldman@redhat.com> - 0.6.4-3
 - Changelog rewritten
 - Added Require: parted and e2fsprogs
 
-* Sat Nov 20 2010  <mgoldman@redhat.com> - 0.6.4-2
+* Sat Nov 20 2010 Marek Goldmann <mgoldman@redhat.com> - 0.6.4-2
 - Small set of spec file adjustments
 
-* Mon Nov 15 2010  <mgoldman@redhat.com> - 0.6.4-1
+* Mon Nov 15 2010 Marek Goldmann <mgoldman@redhat.com> - 0.6.4-1
 - Updated to new upstream release: 0.6.4
 - Removed BuildRoot tag
 - Adjusted Requires and BuildRequires
@@ -226,12 +239,12 @@ popd
 - [BGBUILD-92] Enable --trace switch by default
 - [BGBUILD-91] Log exceptions to log file
 
-* Tue Nov 09 2010  <mgoldman@redhat.com> - 0.6.3-1
+* Tue Nov 09 2010 Marek Goldmann <mgoldman@redhat.com> - 0.6.3-1
 - [BGBUILD-94] Check if set_network call is avaialbe in libguestfs
 - Added 'check' section that executes tests
 
-* Wed Nov 03 2010  <mgoldman@redhat.com> - 0.6.2-1
+* Wed Nov 03 2010 Marek Goldmann <mgoldman@redhat.com> - 0.6.2-1
 - [BGBUILD-84] Don't use in libguestfs qemu-kvm where hardware accleration isn't available
 
-* Mon Oct 18 2010  <mgoldman@redhat.com> - 0.6.1-1
+* Mon Oct 18 2010 Marek Goldmann <mgoldman@redhat.com> - 0.6.1-1
 - Initial package

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

@@ -32,153 +32,132 @@ module BoxGrinder
       @helper = GuestFSHelper.new('a/raw/disk', @appliance_config, @config, :log => @log)
     end
 
-    describe ".execute" do
-      it "should prepare and run guestfs" do
+    describe ".prepare_guestfs" do
+      it "should prepare guestfs with normal disk" do
         guestfs = mock('Guestfs')
+        @helper.instance_variable_set(:@guestfs, guestfs)
+
         guestfs.should_receive(:set_append).with('noapic')
         guestfs.should_receive(:set_verbose)
         guestfs.should_receive(:set_trace)
         guestfs.should_receive(:set_selinux).with(1)
 
         @helper.should_receive(:hw_virtualization_available?).and_return(true)
-        @helper.should_receive(:load_selinux_policy)
 
         guestfs.should_receive(:add_drive).with('a/raw/disk')
         guestfs.should_receive(:set_network).with(1)
-        guestfs.should_receive(:launch)
-
-        guestfs.should_receive(:list_devices).and_return(['/dev/vda'])
-        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
-
-        Guestfs.should_receive(:create).and_return(guestfs)
 
-        @helper.should_receive(:mount_partitions).with('/dev/vda', '')
-        @helper.execute.should == @helper
+        @helper.prepare_guestfs(:a => :b) do
+        end
       end
 
       it "should prepare and run guestfs wid IDE disk" do
         guestfs = mock('Guestfs')
+        @helper.instance_variable_set(:@guestfs, guestfs)
+
         guestfs.should_receive(:set_append).with('noapic')
         guestfs.should_receive(:set_verbose)
         guestfs.should_receive(:set_trace)
         guestfs.should_receive(:set_selinux).with(1)
 
         @helper.should_receive(:hw_virtualization_available?).and_return(true)
-        @helper.should_receive(:load_selinux_policy)
 
         guestfs.should_receive(:add_drive_with_if).with('a/raw/disk', 'ide')
         guestfs.should_receive(:set_network).with(1)
-        guestfs.should_receive(:launch)
-        guestfs.should_receive(:list_devices).and_return(['/dev/vda'])
-        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
-
-        Guestfs.should_receive(:create).and_return(guestfs)
 
-        @helper.should_receive(:mount_partitions).with('/dev/vda', '')
-        @helper.execute(nil, :ide_disk => true).should == @helper
+        @helper.prepare_guestfs(:ide_disk => true) {}
       end
 
-      it "should prepare and run guestfs without HW accelerarion enabled for 64 bit host" do
+      it "should prepare guestfs without HW accelerarion enabled" do
         guestfs = mock('Guestfs')
+        @helper.instance_variable_set(:@guestfs, guestfs)
+
         guestfs.should_receive(:set_append).with('noapic')
         guestfs.should_receive(:set_verbose)
         guestfs.should_receive(:set_trace)
         guestfs.should_receive(:set_selinux).with(1)
 
         @helper.should_receive(:hw_virtualization_available?).and_return(false)
-        @helper.should_receive(:load_selinux_policy)
 
-        RbConfig::CONFIG.should_receive(:[]).with('host_cpu').and_return('x86_64')
-
-        File.should_receive(:exists?).with('/usr/bin/qemu-system-x86_64').and_return(true)
-        guestfs.should_receive(:set_qemu).with('/usr/bin/qemu-system-x86_64')
+        guestfs.should_receive(:set_qemu).with(/\/qemu\.wrapper$/)
         guestfs.should_receive(:add_drive).with('a/raw/disk')
         guestfs.should_receive(:set_network).with(1)
-        guestfs.should_receive(:launch)
-        guestfs.should_receive(:list_devices).and_return(['/dev/vda'])
-        guestfs.should_receive(:list_partitions).and_return([])
 
-        Guestfs.should_receive(:create).and_return(guestfs)
-
-        @helper.should_receive(:mount_partition).with('/dev/vda', '/', '')
-        @helper.execute.should == @helper
+        @helper.prepare_guestfs {}
       end
+    end
 
-      it "should prepare and run guestfs without HW accelerarion enabled for 32 bit host" do
+    describe ".initialize_guestfs" do
+      it "should initialize the guestfs env with callback support" do
         guestfs = mock('Guestfs')
-        guestfs.should_receive(:set_append).with('noapic')
-        guestfs.should_receive(:set_verbose)
-        guestfs.should_receive(:set_trace)
-        guestfs.should_receive(:set_selinux).with(1)
+        guestfs.should_receive(:respond_to?).with(:set_event_callback).and_return(true)
+        @helper.should_receive(:log_callback)
 
-        @helper.should_receive(:hw_virtualization_available?).and_return(false)
-        @helper.should_receive(:load_selinux_policy)
+        FileUtils.should_receive(:mkdir_p).with('/tmp')
+        Guestfs.should_receive(:create).and_return(guestfs)
 
-        RbConfig::CONFIG.should_receive(:[]).with('host_cpu').and_return('i386')
+        @helper.initialize_guestfs
+      end
 
-        File.should_receive(:exists?).with('/usr/bin/qemu').and_return(true)
-        guestfs.should_receive(:set_qemu).with('/usr/bin/qemu')
-        guestfs.should_receive(:add_drive).with('a/raw/disk')
-        guestfs.should_receive(:set_network).with(1)
-        guestfs.should_receive(:launch)
-        guestfs.should_receive(:list_devices).and_return(['/dev/vda'])
-        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
+      it "should initialize the guestfs env without callback support" do
+        guestfs = mock('Guestfs')
+        guestfs.should_receive(:respond_to?).with(:set_event_callback).and_return(false)
+        @helper.should_receive(:log_hack)
 
+        FileUtils.should_receive(:mkdir_p).with('/tmp')
         Guestfs.should_receive(:create).and_return(guestfs)
 
-        @helper.should_receive(:mount_partitions).with('/dev/vda', '')
-        @helper.execute.should == @helper
+        @helper.initialize_guestfs
       end
+    end
 
-      it "should prepare and run guestfs with one partition" do
+    describe ".execute" do
+      it "should run guestfs with one partition" do
         @appliance_config.stub!(:hardware).and_return(:partitions => {'/' => nil})
 
         guestfs = mock('Guestfs')
-        guestfs.should_receive(:set_append).with('noapic')
-        guestfs.should_receive(:set_verbose)
-        guestfs.should_receive(:set_trace)
-        guestfs.should_receive(:set_selinux).with(1)
-
-        @helper.should_receive(:hw_virtualization_available?).and_return(true)
-        @helper.should_receive(:load_selinux_policy)
+        @helper.instance_variable_set(:@guestfs, guestfs)
 
-        guestfs.should_receive(:add_drive).with('a/raw/disk')
-        guestfs.should_receive(:set_network).with(1)
         guestfs.should_receive(:launch)
         guestfs.should_receive(:list_devices).and_return(['/dev/vda'])
         guestfs.should_receive(:list_partitions).and_return(['/dev/vda1'])
 
-        Guestfs.should_receive(:create).and_return(guestfs)
-
-        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1'])
-        @helper.should_receive(:mount_partition).with("/dev/vda1", "/", '')
-
-        guestfs.should_receive(:set_e2label).with("/dev/vda1", "79d3d2d4")
+        @helper.should_receive(:mount_partitions).with("/dev/vda", '')
+        @helper.should_receive(:load_selinux_policy)
 
-        @helper.execute.should == @helper
+        @helper.execute
       end
 
-      it "should prepare and run guestfs with no partitions" do
+      it "should run guestfs with two partitions" do
+        @appliance_config.stub!(:hardware).and_return(:partitions => {'/' => nil, '/home' => nil})
+
         guestfs = mock('Guestfs')
-        guestfs.should_receive(:set_append).with('noapic')
-        guestfs.should_receive(:set_verbose)
-        guestfs.should_receive(:set_trace)
-        guestfs.should_receive(:set_selinux).with(1)
+        @helper.instance_variable_set(:@guestfs, guestfs)
 
-        @helper.should_receive(:hw_virtualization_available?).and_return(true)
+        guestfs.should_receive(:launch)
+        guestfs.should_receive(:list_devices).and_return(['/dev/vda'])
+        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
+
+        @helper.should_receive(:mount_partitions).with("/dev/vda", "")
         @helper.should_receive(:load_selinux_policy)
 
-        guestfs.should_receive(:add_drive).with('a/raw/disk')
-        guestfs.should_receive(:set_network).with(1)
+        @helper.execute
+      end
+
+      it "should run guestfs with no partitions and don't load selinux" do
+        @appliance_config.stub!(:hardware).and_return(:partitions => {'/' => nil, '/home' => nil})
+
+        guestfs = mock('Guestfs')
+        @helper.instance_variable_set(:@guestfs, guestfs)
+
         guestfs.should_receive(:launch)
+        guestfs.should_receive(:list_devices).and_return(['/dev/vda'])
         guestfs.should_receive(:list_partitions).and_return([])
 
-        Guestfs.should_receive(:create).and_return(guestfs)
-
-        guestfs.should_receive(:list_devices).and_return(['/dev/sda'])
-        @helper.should_receive(:mount_partition).with("/dev/sda", "/", '')
+        @helper.should_receive(:mount_partition).with("/dev/vda", "/", "")
+        @helper.should_not_receive(:load_selinux_policy)
 
-        @helper.execute.should == @helper
+        @helper.execute(:load_selinux_policy => false)
       end
     end
 
@@ -194,26 +173,37 @@ module BoxGrinder
       @helper.clean_close
     end
 
-    it "should mount partition" do
-      guestfs = mock('Guestfs')
+    describe ".mount_partition" do
+      it "should mount root partition" do
+        guestfs = mock('Guestfs')
 
-      guestfs.should_receive(:mount_options).with("", "/dev/sda", "/")
+        guestfs.should_receive(:mount_options).with("", "/dev/sda", "/")
+        guestfs.should_receive(:set_e2label).with("/dev/sda", "79d3d2d4")
 
-      @helper.instance_variable_set(:@guestfs, guestfs)
-      @helper.mount_partition("/dev/sda", "/")
+        @helper.instance_variable_set(:@guestfs, guestfs)
+        @helper.mount_partition("/dev/sda", "/")
+      end
+
+      it "should mount home partition" do
+        guestfs = mock('Guestfs')
+
+        guestfs.should_receive(:mount_options).with("", "/dev/sda", "/home")
+        guestfs.should_receive(:set_e2label).with("/dev/sda", "d5219c04")
+
+        @helper.instance_variable_set(:@guestfs, guestfs)
+        @helper.mount_partition("/dev/sda", "/home")
+      end
     end
 
     describe ".mount_partitions" do
-      it "should mount partitions" do
+      it "should mount two partitions" do
         guestfs = mock('Guestfs')
 
         @appliance_config.stub!(:hardware).and_return(:partitions => {'/' => nil, '/home' => nil})
         guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
 
         @helper.should_receive(:mount_partition).with('/dev/vda1', '/', '')
-        guestfs.should_receive(:set_e2label).with("/dev/vda1", "79d3d2d4")
         @helper.should_receive(:mount_partition).with('/dev/vda2', '/home', '')
-        guestfs.should_receive(:set_e2label).with("/dev/vda2", "d5219c04")
 
         @helper.instance_variable_set(:@guestfs, guestfs)
         @helper.mount_partitions('/dev/vda')
@@ -226,13 +216,9 @@ module BoxGrinder
         guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2', '/dev/vda3', '/dev/vda4', '/dev/vda5'])
 
         @helper.should_receive(:mount_partition).with('/dev/vda1', '/', '')
-        guestfs.should_receive(:set_e2label).with("/dev/vda1", "79d3d2d4")
         @helper.should_receive(:mount_partition).with('/dev/vda2', '/home', '')
-        guestfs.should_receive(:set_e2label).with("/dev/vda2", "d5219c04")
         @helper.should_receive(:mount_partition).with('/dev/vda3', '/var/www', '')
-        guestfs.should_receive(:set_e2label).with("/dev/vda3", "8d86efc1")
         @helper.should_receive(:mount_partition).with('/dev/vda5', '/var/mock', '')
-        guestfs.should_receive(:set_e2label).with("/dev/vda5", "e7b3b1f2")
 
         @helper.instance_variable_set(:@guestfs, guestfs)
         @helper.mount_partitions('/dev/vda')
@@ -262,13 +248,13 @@ module BoxGrinder
     describe ".hw_virtualization_available?" do
       it "should return true if HW acceleration is available" do
         Resolv.should_receive(:getname).with("169.254.169.254").and_return("blah")
-        @helper.should_receive(:`).with('cat /proc/cpuinfo | grep flags | grep vmx | wc -l').and_return("2")
+        @helper.should_receive(:`).with("egrep '^flags.*(vmx|svm)' /proc/cpuinfo | wc -l").and_return("2")
         @helper.hw_virtualization_available?.should == true
       end
 
       it "should return false if no vmx flag is present" do
         Resolv.should_receive(:getname).with("169.254.169.254").and_return("blah")
-        @helper.should_receive(:`).with('cat /proc/cpuinfo | grep flags | grep vmx | wc -l').and_return("0")
+        @helper.should_receive(:`).with("egrep '^flags.*(vmx|svm)' /proc/cpuinfo | wc -l").and_return("0")
         @helper.hw_virtualization_available?.should == false
       end
 
@@ -332,5 +318,47 @@ module BoxGrinder
         @helper.umount_partition('/dev/vda1')
       end
     end
+
+    describe ".customize" do
+      it "should execute customize wihout issues" do
+        @helper.should_receive(:initialize_guestfs).and_yield
+        @helper.should_receive(:clean_close)
+        @helper.should_receive(:execute).with(:a => :b)
+
+        @helper.customize(:a => :b) do |guestfs, guestfs_helper|
+        end
+      end
+    end
+
+    describe ".log_callback" do
+      it "should register callback for all 3 events" do
+        guestfs = mock('Guestfs')
+        @helper.instance_variable_set(:@guestfs, guestfs)
+        guestfs.should_receive(:set_event_callback).with(an_instance_of(Proc), 16 | 32 | 64)
+        @helper.log_callback
+      end
+    end
+
+    describe ".log_hack" do
+      it "should register callback for all 3 events" do
+        guestfs = mock('Guestfs')
+        pread = ['a', 'b']
+        pwrite = mock('pwrite')
+        old_stderr = mock('old_stderr')
+
+        IO.should_receive(:pipe).and_return([pread, pwrite])
+        STDERR.should_receive(:clone).and_return(old_stderr)
+        STDERR.should_receive(:reopen).with(pwrite)
+        STDERR.should_receive(:reopen).with(old_stderr)
+
+        pread.should_receive(:close)
+        pwrite.should_receive(:close)
+
+        Process.should_receive(:wait)
+
+        @helper.should_receive(:fork)
+        @helper.log_hack
+      end
+    end
   end
 end