system-builder 0.0.23 → 0.0.26

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    system-builder (0.0.23)
+    system-builder (0.0.26)
 
 GEM
   remote: http://rubygems.org/

data/bin/box

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
+require 'tmpdir'
 
 @options = {}
 OptionParser.new do |opts|
@@ -22,6 +23,14 @@ OptionParser.new do |opts|
           "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("-e", "--external-extlinux",
+          "Don't use extlinux provided by image") { |arg| @options[:external_extlinux] = true }
+  opts.on("-b", "--name=<box name>", String,
+          "The box name") { |arg| @options[:name] = arg }
+  opts.on("-m", "--mac-index=<index>", Integer,
+          "An numeric index uses to choose mac") { |arg| @options[:mac_index] = arg }
+  opts.on("-n", "--dry-run",
+          "Dry run mode") { |arg| @options[:dry_run] = true }
   opts.on("-h", "--help",
           "Show this help message.") { puts opts; exit }
   opts.parse!(ARGV)
@@ -33,128 +42,172 @@ OptionParser.new do |opts|
   end
 end
 
+module SystemTools
+
+  def sh(command)
+    puts "* #{command}"
+    unless @dry_run
+      raise "command failed: '#{command}'" unless system command
+    end
+  end
+
+  def sudo(command)
+    sh "sudo #{command}"
+  end
+
+end
+
 class BoxCommand
+  include SystemTools
 
   def boot(options = {})
     qemu_options = []
 
     qemu_disks = []
 
+    dist_dir = ["dist", options[:name]].compact.join("/")
+
     case options[:root]
     when "iso"
-      qemu_options << "-cdrom dist/iso"
+      qemu_options << "-cdrom #{dist_dir}/iso"
       qemu_options << "--boot order=d"
     else
-      qemu_disks << "dist/disk"
+      qemu_disks << "#{dist_dir}/disk"
     end
 
-    qemu_disks.push *Dir["dist/storage*"]
+    qemu_disks.push *Dir["#{dist_dir}/storage*"]
 
     qemu_disks.each_with_index do |disk, index|
       qemu_options << "-drive file=#{disk},if=ide,index=#{index+1},media=disk"
     end
 
-    qemu_options << "-net nic -net vde,sock=/var/run/vde2/tap0.ctl"
+    mac_address_index = (options[:mac_index] or 0)
+    mac_address = "52:54:00:12:34:#{56+mac_address_index}"
+    
+    qemu_options << "-net nic,macaddr=#{mac_address} -net vde,sock=/var/run/vde2/tap0.ctl"
+
+    memory = (ENV['MEMORY'] or "512")
 
     ENV['QEMU_AUDIO_DRV']='alsa'
 
-    qemu_command = "qemu -enable-kvm -m 512m -soundhw ac97 #{qemu_options.join(' ')}"
+    qemu_command = "qemu -enable-kvm -m #{memory}m -soundhw ac97 #{qemu_options.join(' ')}"
 
     puts "Run #{qemu_command}"
     system qemu_command
   end
 
-  def clone(options = {})
-    target = (options[:target] or "/dev/sdb")
-    disk_image = (options[:image] or "dist/disk")
-    partition = "#{target}1"
-    tmpdir = "/tmp/dist"
-
-    sh "[ -d #{tmpdir} ]||mkdir #{tmpdir}"
-    if disk_image =~ /([a-z]+box)-(\d+-\d+)/
-      # like pigebox-20101014-1155
-      name = $1
-      release = $2
-      disk_image = "#{tmpdir}/#{name}-#{release}.disk"
-      sh "ssh dev.tryphon.priv cat /var/lib/buildbot/dist/#{name}/#{name}-#{release}.disk.gz | gunzip -c > #{disk_image}" unless File.exist?(disk_image)
+  class Cloner
+    include SystemTools
+
+    attr_accessor :target, :image, :dry_run, :skip_format, :external_extlinux
+
+    def initialize(options = {}) 
+      options = { :target => "/dev/sdb", :image => "dist/disk" }.merge options
+      options.each { |k,v| send "#{k}=", v }
     end
 
-    raise "Can't find #{disk_image}" unless File.exists?(disk_image)
+    def partition
+      "#{target}1"
+    end
 
-    #if partition_mount = mounts.assoc(partition)
-    #  partition_mount_point = partition_mount[1]
-    #else
-      partition_mount_point = "#{tmpdir}/boot"
-      #sudo "mkdir #{partition_mount_point}" unless File.exist? partition_mount_point
-      #sudo "mount #{partition} #{partition_mount_point}"
-    #end
+    def mounts
+      IO.readlines("/proc/mounts").map { |m| m.scan(/\S+/) }
+    end
 
-    #unless File.exists? "#{partition_mount_point}/config.pp"
-      $stdout.write "Confirm you want install box image (#{disk_image}) in #{target} [y/N] :"
-      $stdout.flush
-      exit 1 unless $stdin.read(1).downcase == 'y'
-    #end
+    def mount(volume, options = {}, &block)
+      name = File.basename(volume)
+
+      unless target = options.delete(:target)
+        Dir.mktmpdir("#{name}-") do |target|
+          mount volume, {:target => target}.merge(options), &block
+        end
+        return
+      end
+
+      name = File.basename(volume)
+      mount_options = options.collect do |pair|
+        [ pair - [true] ].join('=')
+      end.join(',')
+
+      mount_options = "-o #{mount_options}" unless mount_options.empty?
+
+      begin
+        sudo "mount #{mount_options} #{volume} #{target}"
+        yield target
+      ensure
+        sudo "umount #{target}"
+      end
+    end
 
-    if mounts.assoc(partition)
-      puts "Unmount #{target}"
-      exit 1 unless system "sudo umount #{partition}"
+    def mount_image
+      mount(image, :loop => true, :offset => 64*512) do |mount_dir|
+        yield mount_dir
+      end
     end
 
-    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 -L boot #{partition}"
+    def chroot(root, command)
+      sudo "mount proc #{root}/proc -t proc"
+      sudo "mount -o bind /dev #{root}/dev"
+
+      begin
+        sudo "chroot #{root} #{command}"
+      ensure
+        sudo "umount #{root}/proc"
+        sudo "umount #{root}/dev"
+      end
     end
 
-    sh "[ -d #{partition_mount_point} ]||mkdir #{partition_mount_point}"
-    
-    puts "Copy files"
-    sudo "mount #{partition} #{partition_mount_point}"
-    mount_disk_image_fs(disk_image) do |dir|
-      sudo "rsync -av #{dir}/ #{partition_mount_point}/"
+    def clone
+      puts "Dry run mode" if dry_run
+      confirm
+      format unless skip_format
+      copy
+      extlinux
     end
-    sudo "umount #{partition_mount_point}"
-
-    puts "Install extlinux"
-    sudo "mount #{partition} #{partition_mount_point}"
-    #sudo "mount proc #{partition_mount_point}/proc -t proc"
-    #sudo "mount -o bind /dev #{partition_mount_point}/dev"
-
-    begin
-      #sudo "chroot #{tmpdir} /usr/bin/extlinux --install /boot"
-      sudo "/usr/sbin/extlinux --install #{partition_mount_point}"
-    ensure
-      #sudo "umount #{tmpdir}/proc"
-      #sudo "umount #{tmpdir}/dev"
-      sudo "umount #{partition_mount_point}"
+
+    def extlinux
+      mount(partition) do |partition_mount|
+        if external_extlinux
+          sudo "extlinux --install #{partition_mount}"
+        else
+          mount("#{partition_mount}/filesystem.squashfs", :loop => true) do |root|
+            mount(partition_mount, :bind => true, :target => "#{root}/boot") do
+              chroot root, "extlinux --install /boot"
+            end
+          end
+        end
+      end
+
+      # Required ?
+      # sudo "dd if=/usr/lib/syslinux/mbr.bin of=#{target}"
     end
 
-    sudo "dd if=/usr/lib/syslinux/mbr.bin of=#{target}"
-  end
+    def copy
+      puts "Copy files"
+      mount_image do |image_mount|
+        mount(partition) do |partition_mount|
+          sudo "rsync -av #{image_mount}/ #{partition_mount}/"
+        end
+      end
+    end
 
-  def sh(command)
-    puts "Run #{command}"
-    raise "command failed: '#{command}'" unless system command
-  end
+    def 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
 
-  def sudo(command)
-    sh "sudo #{command}"
-  end
+    def confirm
+      $stdout.write "Confirm you want install box image (#{image}) in #{target} [y/N] :"
+      $stdout.flush
+      exit 1 unless $stdin.read(1).downcase == 'y'
+    end
 
-  def mounts
-    IO.readlines("/proc/mounts").map { |m| m.scan(/\S+/) }
   end
 
-  def mount_disk_image_fs(disk_image)
-    mount_dir = "/tmp/mount_boot_fs"
-    sh "[ -d #{mount_dir} ]||mkdir -p #{mount_dir}"
-    begin
-      sudo "mount -o loop,offset=#{64*512} #{disk_image} #{mount_dir}"
-      yield mount_dir
-    ensure
-      sudo "umount #{mount_dir}"
-    end
+  def clone(options = {})
+    Cloner.new(options).clone
   end
 
   def upgrade(options = {})

data/lib/system_builder.rb

@@ -20,7 +20,6 @@ end
 require 'system_builder/version'
 require 'system_builder/core_ext'
 require 'system_builder/disk_image'
-require 'system_builder/iso_image'
 require 'system_builder/live_image'
 require 'system_builder/init_ram_fs_configurator'
 require 'system_builder/disk_squashfs_image'

data/lib/system_builder/boot.rb

@@ -67,7 +67,7 @@ class SystemBuilder::DebianBoot
     unless @configurators.empty?
       chroot do |chroot|
         @configurators.each do |configurator|
-          configurator.configure(chroot)
+          configurator.configure chroot, :debian_release => version
         end
       end
     end
@@ -188,7 +188,7 @@ class SystemBuilder::DebianBoot
       end
     end
 
-    def configure(chroot)
+    def configure(chroot, options = {})
       rewrite_sources_url(chroot)
       update(chroot)
       configure_proxy(chroot)
@@ -287,7 +287,7 @@ class SystemBuilder::DebianBoot
     def rsync(target, *sources)
       sources = sources.flatten
       options = (Hash === sources.last ? sources.pop : {})
-      rsync_options = options.collect { |k,v| v == true ? "--#{k}" : "--#{k}=#{v}" }
+      rsync_options = options.collect { |k,v| v == true ? "--#{k}" : "--#{k}='#{v}'" }
       FileUtils::sudo "rsync -a #{rsync_options.join(' ')} #{sources.join(' ')} #{expand_path(target)}"
     end
 

data/lib/system_builder/box.rb

@@ -14,52 +14,67 @@ class SystemBuilder::Box
     @release_name ||= "#{name}-#{release_number}"
   end
 
+  attr_accessor :named_mode
+  alias_method :named_mode?, :named_mode
+
+  def build_dir
+    named_mode? ? "build/#{name}" : "build"
+  end
+
+  def dist_dir
+    named_mode? ? "dist/#{name}" : "dist"
+  end 
+
   def root_file
-    "build/root"
+    "#{build_dir}/root"
   end
 
   def boot
-    @boot ||= SystemBuilder::DebianBoot.new(root_file).tap do |boot|
-      boot.configurators << puppet_configurator
-    end
+    @boot ||= SystemBuilder::DebianBoot.new(root_file)
+    unless @boot_configurated
+      @boot_configurated = true
 
-    yield @boot if block_given?
+      yield @boot if block_given?
+      @boot.configurators << puppet_configurator
+    end
     @boot
   end
 
   def puppet_configurator
-    @puppet_configurator ||= SystemBuilder::PuppetConfigurator.new :release_name => release_name
+    @puppet_configurator ||= SystemBuilder::PuppetConfigurator.new :box_name => name, :release_name => release_name, :debian_release => boot.version
     yield @puppet_configurator if block_given?
     @puppet_configurator
   end
 
   def disk_file
-    "dist/disk"
+    "#{dist_dir}/disk"
   end
 
   def disk_image
     @disk_image ||= SystemBuilder::DiskSquashfsImage.new(disk_file).tap do |image|
       image.boot = boot
       image.size = 200.megabytes
+      image.build_dir = build_dir
     end
     yield @disk_image if block_given?
     @disk_image
   end
 
   def iso_file
-    "dist/iso"
+    "#{dist_dir}/iso"
   end
 
   def iso_image
     @iso_image ||= SystemBuilder::IsoSquashfsImage.new(iso_file).tap do |image|
       image.boot = boot
+      image.build_dir = build_dir
     end
     yield @iso_image if block_given?
     @iso_image
   end
 
   def nfs_file
-    "dist/nfs"
+    "#{dist_dir}/nfs"
   end
 
   def nfs_image
@@ -71,18 +86,18 @@ class SystemBuilder::Box
   end
 
   def upgrade_directory
-    "build/upgrade"
+    "#{build_dir}/upgrade"
   end
 
   def upgrade_file
-    "dist/upgrade.tar"
+    "#{dist_dir}/upgrade.tar"
   end
 
   def upgrade_checksum
     `sha256sum #{upgrade_file}`.split.first
   end
 
-  def create_latest_file(latest_file)
+  def create_latest_file(latest_file = latest_file)
     File.open(latest_file, "w") do |f|
       f.puts "name: #{release_name}"
       f.puts "url: http://download.tryphon.eu/#{name}/#{name}-#{release_number}.tar"
@@ -92,4 +107,8 @@ class SystemBuilder::Box
     end
   end
 
+  def latest_file
+    "#{dist_dir}/latest.yml"
+  end
+
 end

data/lib/system_builder/box_tasks.rb

@@ -2,6 +2,15 @@ require 'rake/tasklib'
 
 class SystemBuilder::BoxTasks < Rake::TaskLib
 
+  # FIXME we can't count box instances .. the first box doesn't "see" next ones
+  @@multiple_boxes = nil
+  def self.multiple_boxes=(multiple_boxes)
+    @@multiple_boxes = multiple_boxes
+  end
+  def self.multiple_boxes?
+    @@multiple_boxes
+  end
+
   attr_reader :box
 
   def initialize(box, &block)
@@ -14,6 +23,8 @@ class SystemBuilder::BoxTasks < Rake::TaskLib
         box
       end
 
+    @box.named_mode = self.class.multiple_boxes?
+
     yield @box if block_given?
 
     define
@@ -34,6 +45,10 @@ class SystemBuilder::BoxTasks < Rake::TaskLib
       desc "Shortcut for dist:disk task"
       task :dist => "dist:disk"
 
+      task :inspect do
+        puts box.inspect
+      end
+
       namespace :dist do
         desc "Create disk image in #{box.disk_file}"
         task :disk do
@@ -54,12 +69,12 @@ class SystemBuilder::BoxTasks < Rake::TaskLib
         task :upgrade do
           rm_rf box.upgrade_directory
           mkdir_p box.upgrade_directory
-          ln_s File.expand_path("build/filesystem.squashfs"), "#{box.upgrade_directory}/filesystem-#{box.release_name}.squashfs"
+          ln_s File.expand_path("#{box.build_dir}/filesystem.squashfs"), "#{box.upgrade_directory}/filesystem-#{box.release_name}.squashfs"
           ln_s File.expand_path("#{box.root_file}/vmlinuz"), "#{box.upgrade_directory}/vmlinuz-#{box.release_name}"
           ln_s File.expand_path("#{box.root_file}/initrd.img"), "#{box.upgrade_directory}/initrd-#{box.release_name}.img"
-          sh "tar -cf #{box.upgrade_file} --dereference -C #{box.upgrade_directory} ."
+          FileUtils::sh "tar -cf #{box.upgrade_file} --dereference -C #{box.upgrade_directory} ."
 
-          box.create_latest_file "dist/latest.yml"
+          box.create_latest_file "#{box.dist_dir}/latest.yml"
         end
 
         desc "Create all images (disk, iso and upgrade)"
@@ -82,20 +97,20 @@ class SystemBuilder::BoxTasks < Rake::TaskLib
       desc "Clean build and dist directories"
       task :clean do
         unless File.exists?(box.root_file) and system "sudo fuser $PWD/#{box.root_file}"
-          sh "sudo rm -rf #{box.root_file}"
+          sudo "rm -rf #{box.root_file}"
         end
-        sh "rm -rf build/upgrade"
-        sh "rm -f build/*"
-        sh "rm -rf dist/*"
+        FileUtils::sh "rm -rf #{box.upgrade_directory}"
+        FileUtils::sh "rm -f #{box.build_dir}/*"
+        FileUtils::sh "rm -rf #{box.dist_dir}/*"
       end
 
       task :buildbot => [:clean, "dist:all", "buildbot:dist"] do
         # clean in dependencies is executed only once
-        sh "rake #{box.name}:clean"
+        FileUtils::sh "rake #{box.name}:clean"
       end
 
       def latest_release_number
-        YAML.load(IO.read("dist/latest.yml"))["name"].gsub("#{box.name}-","") if File.exists?("dist/latest.yml")
+        YAML.load(IO.read(box.latest_file))["name"].gsub("#{box.name}-","") if File.exists?(box.latest_file)
       end
 
       namespace :buildbot do
@@ -108,7 +123,7 @@ class SystemBuilder::BoxTasks < Rake::TaskLib
           cp box.iso_file, "#{target_directory}/#{box.name}-#{release_number}.iso"
           cp box.upgrade_file, "#{target_directory}/#{box.name}-#{release_number}.tar"
 
-          cp "dist/latest.yml", "#{target_directory}/latest.yml"
+          cp box.latest_file, "#{target_directory}/latest.yml"
         end
       end
 

data/lib/system_builder/configurator.rb

@@ -6,7 +6,7 @@ module SystemBuilder
       @proc = (proc or block)
     end
 
-    def configure(chroot)
+    def configure(chroot, options = {})
       @proc.call chroot
     end
 
@@ -25,24 +25,26 @@ module SystemBuilder
       %w{manifests files modules templates plugins}.collect { |d| "#{manifest}/#{d}" }.select { |d| File.directory?(d) }
     end
 
-    def configure(chroot)
+    def configure(chroot, options = {})
+      debian_release = (options.delete(:debian_release) or :lenny)
+
       puts "* run puppet configuration"
 
-      unless chroot.image.exists?("/etc/apt/sources.list.d/lenny-backports.list")
-        chroot.image.open("/etc/apt/sources.list.d/lenny-backports.list") do |f|
-          f.puts "deb http://backports.debian.org/debian-backports lenny-backports main contrib non-free"
+      unless chroot.image.exists?("/etc/apt/sources.list.d/#{debian_release}-backports.list")
+        chroot.image.open("/etc/apt/sources.list.d/#{debian_release}-backports.list") do |f|
+          f.puts "deb http://backports.debian.org/debian-backports #{debian_release}-backports main contrib non-free"
         end
 
         chroot.image.open("/etc/apt/preferences") do |f|
           f.puts "Package: puppet"
-          f.puts "Pin: release a=lenny-backports"
+          f.puts "Pin: release a=#{debian_release}-backports"
           f.puts "Pin-Priority: 999"
-        end
+        end if debian_release == :lenny
         
         chroot.sudo "apt-get update"
       end
 
-      chroot.apt_install :puppet
+      chroot.apt_install :puppet, :rubygems
       chroot.image.open("/etc/default/puppet") do |f|
         f.puts "START=no"
       end
@@ -50,7 +52,7 @@ module SystemBuilder
       unless File.directory?(manifest)
         chroot.image.install "/tmp/puppet.pp", manifest
         # 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"
+        chroot.sudo "puppet --color=false tmp/puppet.pp 2>&1 | tee /tmp/puppet.log && chmod +r /tmp/puppet.log"
         process_log_file(chroot.image.expand_path("/tmp/puppet.log"))
       else
         context_dir = "/tmp/puppet"
@@ -74,7 +76,9 @@ module SystemBuilder
         end
 
         chroot.image.mkdir "#{context_dir}/tmp"
-        chroot.sudo "puppet --color=false --modulepath '#{context_dir}/modules' --confdir='#{context_dir}/config' --templatedir='#{context_dir}/templates' --manifestdir='#{context_dir}/manifests' --vardir=#{context_dir}/tmp '#{context_dir}/manifests/site.pp' | tee #{context_dir}/puppet.log"
+
+        debian_options = "export DEBIAN_SCRIPT_DEBUG=1;" if ENV['DEBIAN_SCRIPT_DEBUG']
+        chroot.sudo "#{debian_options} puppet --color=false --modulepath '#{context_dir}/modules' --confdir='#{context_dir}/config' --templatedir='#{context_dir}/templates' --manifestdir='#{context_dir}/manifests' --vardir=#{context_dir}/tmp '#{context_dir}/manifests/site.pp' 2>&1 | tee #{context_dir}/puppet.log"
 
         process_log_file(chroot.image.expand_path("#{context_dir}/puppet.log"))
       end
@@ -82,7 +86,7 @@ module SystemBuilder
 
     def process_log_file(log_file)
       FileUtils.cp log_file, "puppet.log"
-      unless File.readlines("puppet.log").grep(/^err:/).empty?
+      unless File.readlines("puppet.log").grep(/^(err:|Could not parse for environment production)/).empty?
         raise "Error(s) during puppet configuration, see puppet.log file"
       end
     end

data/lib/system_builder/core_ext.rb

@@ -39,6 +39,8 @@ class String
 
 end
 
+# require 'rake/file_utils'
+
 module FileUtils
 
   def sh(*cmd)

data/lib/system_builder/disk_nfsroot_image.rb

@@ -72,7 +72,7 @@ class SystemBuilder::DiskNfsRootImage
     root = (options[:root] or "LABEL=#{fs_label}")
     version = (options[:version] or Time.now.strftime("%Y%m%d%H%M"))
     nfssvr = %x{/sbin/ip link show|grep -e "eth.:"|cut -d' ' -f 2|cut -d':' -f 1|xargs ip addr show|grep "inet "|cut -d' ' -f 6|cut -d'/' -f 1}.strip
-    nfsroot = %x{readlink -f build/root}.strip
+    nfsroot = %x{readlink -f #{boot.root}}.strip
     nfsopt = (options[:nfsroot] or "#{nfssvr}:#{nfsroot}")
 
     mount_boot_fs do |mount_dir|

data/lib/system_builder/disk_squashfs_image.rb

@@ -27,6 +27,7 @@ class SystemBuilder::DiskSquashfsImage
 
     compress_root_fs
     install_extlinux
+    compute_checksums
 
     self
   end
@@ -62,12 +63,22 @@ class SystemBuilder::DiskSquashfsImage
     end
   end
 
+  attr_accessor :build_dir
+
+  def build_dir
+    @build_dir ||= "build"
+  end 
+
+  def squashfs_file
+    "#{build_dir}/filesystem.squashfs"
+  end
+
   def compress_root_fs
-    FileUtils::sudo "mksquashfs #{boot.root}/ build/filesystem.squashfs -noappend -e /boot"
-    FileUtils::sudo "chown #{ENV['USER']} build/filesystem.squashfs && chmod +r build/filesystem.squashfs"
+    FileUtils::sudo "mksquashfs #{boot.root}/ #{squashfs_file} -noappend -e #{boot.root}/boot"
+    FileUtils::sudo "chown #{ENV['USER']} #{squashfs_file} && chmod +r #{squashfs_file}"
     
     mount_boot_fs do |mount_dir|
-      FileUtils::sudo "cp build/filesystem.squashfs #{mount_dir}/filesystem.squashfs"
+      FileUtils::sudo "cp #{squashfs_file} #{mount_dir}/filesystem.squashfs"
     end
     FileUtils.touch file
   end
@@ -107,6 +118,14 @@ class SystemBuilder::DiskSquashfsImage
     FileUtils::sh "dd if=#{boot.root}/usr/lib/syslinux/mbr.bin of=#{file} conv=notrunc"
   end
 
+  def compute_checksums
+    mount_boot_fs do |mount_dir|
+      FileUtils::cd("#{mount_dir}") do
+        FileUtils::sh"md5sum * |sudo tee MD5SUM"
+      end 
+    end
+  end
+
   def fs_label
     "boot"
   end

data/lib/system_builder/init_ram_fs_configurator.rb

@@ -1,8 +1,13 @@
 class SystemBuilder::InitRamFsConfigurator 
 
-  def configure(chroot)
+  def configure(chroot, options = {})
+    debian_release = (options.delete(:debian_release) or :lenny)
+
     puts "* install initramfs-tools"
-    chroot.apt_install %w{initramfs-tools syslinux}
+
+    packages = %w{initramfs-tools syslinux}
+    packages << "extlinux" unless debian_release == :lenny
+    chroot.apt_install packages
 
     install_script(chroot, "local-top/mount_boot") do |f|
       f.puts "modprobe loop"
@@ -33,7 +38,7 @@ class SystemBuilder::InitRamFsConfigurator
 
   @@script_header = <<EOF
 #!/bin/sh -x
-if [ "$1" == "prereqs" ]; then
+if [ "$1" = "prereqs" ]; then
   echo ""; exit 0;
 fi
 EOF

data/lib/system_builder/iso_squashfs_image.rb

@@ -20,10 +20,20 @@ class SystemBuilder::IsoSquashfsImage
     self
   end
 
+  attr_accessor :build_dir
+
+  def build_dir
+    @build_dir ||= "build"
+  end 
+
+  def squashfs_file
+    "#{build_dir}/filesystem.squashfs"
+  end
+
   def compress_root_fs
-    unless File.exists?("build/filesystem.squashfs")
-      FileUtils::sudo "mksquashfs #{boot.root}/ build/filesystem.squashfs -noappend -e /boot"
-      FileUtils::sudo "chown #{ENV['USER']} build/filesystem.squashfs && chmod +r build/filesystem.squashfs"
+    unless File.exists?("#{squashfs_file}")
+      FileUtils::sudo "mksquashfs #{boot.root}/ #{squashfs_file} -noappend -e /boot"
+      FileUtils::sudo "chown #{ENV['USER']} #{squashfs_file} && chmod +r #{squashfs_file}"
     end
   end
 
@@ -49,7 +59,7 @@ class SystemBuilder::IsoSquashfsImage
   end
 
   def make_iso_fs
-    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 "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=#{squashfs_file} #{boot.root}/boot"
     FileUtils::sudo "chown $USER #{file}"
   end
   

data/lib/system_builder/mount_boot.sh

@@ -21,21 +21,39 @@ list_devices() {
 
 mkdir /boot
 
-for device in `list_devices`; do
-    fs_type=`get_fstype ${device}`
-    echo "check if $device ($fs_type) is the boot image"
-
-    case $fs_type in
-        ext2|ext3|iso9660)
-            mount -r -t $fs_type $device /boot
-            if [ -f "/boot/config.pp" ]; then
-                exit 0
-            else
-                umount /boot
-            fi
-            ;;
-    esac
-done
+if [ -n "${nfsroot}" ]; then
+  . /scripts/functions
+	configure_networking
+
+	if [ -z "${nfsopts}" ]; then
+		nfsopts="retrans=10"
+	fi
+
+  echo "check if ${nfsroot} provided boot image"
+  nfsmount -o nolock,ro,${nfsopts} ${nfsroot} /boot    
+  if [ -f "/boot/filesystem.squashfs" ]; then
+      exit 0
+  else
+      echo "no image found on nfs"
+      exit 1
+  fi
+else
+    for device in `list_devices`; do
+        fs_type=`get_fstype ${device}`
+        echo "check if $device ($fs_type) is the boot image"
+
+        case $fs_type in
+            ext2|ext3|iso9660)
+                mount -r -t $fs_type $device /boot
+                if [ -f "/boot/config.pp" ]; then
+                    exit 0
+                else
+                    umount /boot
+                fi
+                ;;
+        esac
+    done
+fi
 
 echo "no image found"
 exit 1

data/lib/system_builder/version.rb

@@ -1,3 +1,3 @@
 module SystemBuilder
-  VERSION = "0.0.23"
+  VERSION = "0.0.26"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: system-builder
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 0
-  - 23
-  version: 0.0.23
+  - 26
+  version: 0.0.26
 platform: ruby
 authors: 
 - Alban Peignier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-09 00:00:00 Z
+date: 2012-02-27 00:00:00 Z
 dependencies: []
 
 description: ""
@@ -61,11 +61,9 @@ files:
 - lib/system_builder/disk_nfsroot_image.rb
 - lib/system_builder/disk_squashfs_image.rb
 - lib/system_builder/init_ram_fs_configurator.rb
-- lib/system_builder/iso_image.rb
 - lib/system_builder/iso_squashfs_image.rb
 - lib/system_builder/live_image.rb
 - lib/system_builder/mount_boot.sh
-- lib/system_builder/task.rb
 - lib/system_builder/version.rb
 - script/console
 - script/destroy
@@ -105,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: system-builder
-rubygems_version: 1.7.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Build bootable images

data/lib/system_builder/iso_image.rb

@@ -1,55 +0,0 @@
-require 'tempfile'
-
-class SystemBuilder::IsoImage
-
-  attr_accessor :boot
-  attr_reader :file
-
-  def initialize(file)
-    @file = file
-  end
-
-  def create
-    boot.create
-    create_iso
-
-    self
-  end
-
-  def create_iso
-    install_isolinux_files
-    make_iso_fs
-  end
-
-  def install_isolinux_files(options = {})
-    root = (options[:root] or "/dev/hdc")
-    version = (options[:version] or Time.now.strftime("%Y%m%d%H%M"))
-
-    boot.image do |image|
-      image.mkdir "/boot/isolinux"
-
-      image.open("/boot/isolinux/isolinux.cfg") do |f|
-        f.puts "default linux"
-        f.puts "label linux"
-        f.puts "kernel /vmlinuz"
-        f.puts "append ro root=#{root} initrd=/initrd.img"
-      end
-
-      image.install "/boot/isolinux", "/usr/lib/syslinux/isolinux.bin"
-    end
-  end
-
-  def readlink_boot_file(boot_file)
-    File.basename(%x{readlink #{boot.root}/#{boot_file}}.strip)
-  end
-
-  def make_iso_fs
-    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
-
-  def root_fs_label
-    "root"
-  end
-
-end

data/lib/system_builder/task.rb

@@ -1,70 +0,0 @@
-require 'rake/tasklib'
-
-class SystemBuilder::Task < Rake::TaskLib
-
-  attr_reader :name
-
-  def initialize(name, &block)
-    @name = name
-
-    @image =
-      if block_given?
-        block.call
-      else
-        SystemBuilder.config(name)
-      end
-
-    define
-  end
-
-  def define
-    namespace name do
-      desc "Create image #{name} in #{@image.file}"
-      task :dist do
-        @image.create
-      end
-      namespace :dist do
-        desc "Create vmware image in #{@image.file}.vdmk"
-        task :vmware do
-          @image.convert "#{@image.file}.vmdk", :format => "vmdk"
-        end
-
-        desc "Create iso image in #{@image.file}.iso"
-        task :iso do
-          SystemBuilder::IsoImage.new("#{@image.file}.iso").tap do |image|
-            image.boot = @image.boot
-          end.create_iso
-        end
-      end
-      task "dist:vmware" => "dist"
-
-      namespace :build do
-        desc "Configure the image system"
-        task :configure do
-          @image.boot.configure
-          @image.boot.clean
-        end
-
-        desc "Clean the image system"
-        task :clean do
-          @image.boot.clean
-        end
-      end
-
-      task :setup do
-        required_packages = []
-        required_packages << "qemu" # to convert image files
-        required_packages << "util-linux" # provides sfdisk
-        required_packages << "sudo"
-        required_packages << "debootstrap"
-        required_packages << "rsync"
-        required_packages << "dosfstools"
-        required_packages << "syslinux"
-        required_packages << "squashfs-tools"
-        
-        FileUtils.sudo "apt-get install #{required_packages.join(' ')}"
-      end
-    end
-  end
-
-end