system-builder 0.0.21 → 0.0.22

data/Gemfile

@@ -0,0 +1,15 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in metalive.gemspec
+gemspec
+
+group :development do
+  gem "rake"
+end
+
+group :test do 
+  gem "rspec"
+  gem "autotest"
+  gem "fakeweb"
+  gem "rcov"
+end

data/Gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: .
+  specs:
+    system-builder (0.0.22)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ZenTest (4.5.0)
+    autotest (4.4.6)
+      ZenTest (>= 4.4.1)
+    diff-lcs (1.1.2)
+    fakeweb (1.3.0)
+    rake (0.9.2)
+    rcov (0.9.9)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  autotest
+  fakeweb
+  rake
+  rcov
+  rspec
+  system-builder!

data/bin/box

@@ -20,6 +20,8 @@ OptionParser.new do |opts|
           "The box image to be cloned") { |arg| @options[:image] = arg }
   opts.on("-h", "--host=<host>", String,
           "The host to be upgraded") { |arg| @options[:host] = arg }
+  opts.on("-s", "--skip-format",
+          "Skip partitionning and formatting") { |arg| @options[:skip_format] = true }
   opts.on("-h", "--help",
           "Show this help message.") { puts opts; exit }
   opts.parse!(ARGV)
@@ -98,9 +100,12 @@ class BoxCommand
       exit 1 unless system "sudo umount #{partition}"
     end
 
-    puts "Install filesystem"
-    sh "echo ',,L,*' | sudo /sbin/sfdisk -f -uS #{target}"
-    sudo "mke2fs -j -L boot #{partition}"
+    unless options[:skip_format]
+      puts "Formatting filesystem"
+      sh "echo ',,L,*' | sudo /sbin/sfdisk -f -uS #{target}"
+      sh "grep -q #{partition} /proc/mounts && sudo umount #{partition} || true"
+      sudo "mke2fs -j -L boot #{partition}"
+    end
 
     sh "[ -d #{partition_mount_point} ]||mkdir #{partition_mount_point}"
     

data/lib/system_builder/configurator.rb

@@ -49,7 +49,8 @@ module SystemBuilder
 
       unless File.directory?(manifest)
         chroot.image.install "/tmp/puppet.pp", manifest
-        chroot.sudo "puppet --color=false tmp/puppet.pp | tee /tmp/puppet.log"
+        # chmod +r to make file readable for buildbot
+        chroot.sudo "puppet --color=false tmp/puppet.pp | tee /tmp/puppet.log && chmod +r /tmp/puppet.log"
         process_log_file(chroot.image.expand_path("/tmp/puppet.log"))
       else
         context_dir = "/tmp/puppet"

data/lib/system_builder/disk_squashfs_image.rb

@@ -92,7 +92,7 @@ class SystemBuilder::DiskSquashfsImage
           f.puts "LABEL linux"
           f.puts "SAY Now booting #{version} from syslinux ..."
           f.puts "KERNEL /vmlinuz"
-          f.puts "APPEND ro initrd=/initrd.img boot=local root=/boot/filesystem.squashfs rootflags=loop rootfstype=squashfs"
+          f.puts "APPEND ro initrd=/initrd.img boot=local root=/boot/filesystem.squashfs rootflags=loop rootfstype=squashfs rootdelay=6"
         end
       end
     end

data/lib/system_builder/iso_image.rb

@@ -44,7 +44,7 @@ class SystemBuilder::IsoImage
   end
 
   def make_iso_fs
-    FileUtils::sudo "mkisofs -quiet -R -o #{file} -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -A #{root_fs_label} -V #{root_fs_label} -graft-points -hide build/root/initrd.img -hide build/root/vmlinuz vmlinuz=#{boot.root}/boot/#{readlink_boot_file('vmlinuz')} initrd.img=#{boot.root}/boot/#{readlink_boot_file('initrd.img')} #{boot.root}"
+    FileUtils::sudo "genisoimage -quiet -R -o #{file} -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -A #{root_fs_label} -V #{root_fs_label} -graft-points -hide build/root/initrd.img -hide build/root/vmlinuz vmlinuz=#{boot.root}/boot/#{readlink_boot_file('vmlinuz')} initrd.img=#{boot.root}/boot/#{readlink_boot_file('initrd.img')} #{boot.root}"
     FileUtils::sudo "chown $USER #{file}"
   end
 

data/lib/system_builder/iso_squashfs_image.rb

@@ -49,7 +49,7 @@ class SystemBuilder::IsoSquashfsImage
   end
 
   def make_iso_fs
-    FileUtils::sudo "mkisofs -quiet -R -o #{file} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -graft-points vmlinuz=#{boot.root}/boot/#{readlink_boot_file('vmlinuz')} initrd.img=#{boot.root}/boot/#{readlink_boot_file('initrd.img')} filesystem.squashfs=build/filesystem.squashfs #{boot.root}/boot"
+    FileUtils::sudo "genisoimage -quiet -R -o #{file} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -graft-points vmlinuz=#{boot.root}/boot/#{readlink_boot_file('vmlinuz')} initrd.img=#{boot.root}/boot/#{readlink_boot_file('initrd.img')} filesystem.squashfs=build/filesystem.squashfs #{boot.root}/boot"
     FileUtils::sudo "chown $USER #{file}"
   end
   

data/lib/system_builder/version.rb

@@ -1,3 +1,3 @@
 module SystemBuilder
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

data/tasks/rspec.rake

@@ -1,11 +1,11 @@
 begin
-  require 'spec'
+  require 'rspec'
 rescue LoadError
   require 'rubygems' unless ENV['NO_RUBYGEMS']
-  require 'spec'
+  require 'rspec'
 end
 begin
-  require 'spec/rake/spectask'
+  require 'rspec/core/rake_task'
 rescue LoadError
   puts <<-EOS
 To use rspec for testing you must install rspec gem:
@@ -15,7 +15,6 @@ EOS
 end
 
 desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = 'spec/**/*_spec.rb'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: system-builder
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 0
-  - 21
-  version: 0.0.21
+  - 22
+  version: 0.0.22
 platform: ruby
 authors: 
 - Alban Peignier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 Z
+date: 2011-07-24 00:00:00 Z
 dependencies: []
 
 description: ""
@@ -32,6 +32,8 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - History.txt
 - Manifest.txt
 - PostInstall.txt