system-builder 0.0.7 → 0.0.9

data/Manifest.txt

@@ -20,8 +20,11 @@ lib/system_builder/configurator.rb
 lib/system_builder/core_ext.rb
 lib/system_builder/disk_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
 script/console
 script/destroy

data/lib/system_builder/configurator.rb

@@ -14,10 +14,11 @@ module SystemBuilder
 
   class PuppetConfigurator
 
-    attr_reader :manifest
+    attr_reader :manifest, :config
 
-    def initialize(manifest = ".")
-      @manifest = manifest
+    def initialize(options = {})
+      @manifest = (options.delete(:manifest) or ".")
+      @config = options.dup
     end
 
     def puppet_directories
@@ -42,6 +43,12 @@ module SystemBuilder
 
         chroot.image.rsync context_dir, puppet_directories, :exclude => "*~", :delete => true
 
+        chroot.image.open("#{context_dir}/manifests/config.pp") do |f|
+          config.each do |key, value|
+            f.puts "$#{key}=\"#{value}\""
+          end
+        end
+
         chroot.image.mkdir "#{context_dir}/config"
         chroot.image.open("#{context_dir}/config/fileserver.conf") do |f|
           %w{files plugins}.each do |mount_point|

data/lib/system_builder/disk_squashfs_image.rb

@@ -11,46 +11,7 @@ class SystemBuilder::DiskSquashfsImage
   end
 
   def create
-    boot.configurators << SystemBuilder::ProcConfigurator.new do |chroot|
-      puts "* install initramfs-tools"
-      chroot.apt_install %w{initramfs-tools syslinux}
-
-      script = "/usr/share/initramfs-tools/scripts/local-top/mount_boot"
-      unless chroot.image.exists?(script)
-        chroot.image.open(script) do |f|
-        f.puts <<EOF
-#!/bin/sh -x
-case ${1:-} in
-  prereqs) echo ""; exit 0;;
-esac
-modprobe loop
-mkdir /boot
-mount -r -t ext3 LABEL=#{fs_label} /boot
-exit 0
-EOF
-        end  
-        chroot.sudo "chmod +x #{script}"
-
-        chroot.image.mkdir "/usr/share/initramfs-tools/scripts/local-bottom"
-        chroot.image.open("/usr/share/initramfs-tools/scripts/local-bottom/umount_boot") do |f|
-        f.puts <<EOF
-#!/bin/sh -x
-case ${1:-} in
-  prereqs) echo ""; exit 0;;
-esac
-mount -n -o move /boot /root/boot
-exit 0
-EOF
-        end  
-        chroot.sudo "chmod +x /usr/share/initramfs-tools/scripts/local-bottom/umount_boot"
-
-        chroot.image.open("/etc/initramfs-tools/modules") do |f|
-          f.puts "squashfs"
-        end
-        chroot.sudo "/usr/sbin/update-initramfs -u"
-      end
-    end
-
+    boot.configurators << SystemBuilder::InitRamFsConfigurator.new
     boot.create
 
     file_creation = (not File.exists?(file))
@@ -101,8 +62,11 @@ EOF
   end
 
   def compress_root_fs
+    FileUtils::sudo "mksquashfs #{boot.root}/ build/filesystem.squashfs -noappend -e /boot"
+    FileUtils::sudo "chown #{ENV['USER']}:#{ENV['USER']} build/filesystem.squashfs && chmod +r build/filesystem.squashfs"
+    
     mount_boot_fs do |mount_dir|
-      FileUtils::sudo "mksquashfs #{boot.root}/ #{mount_dir}/filesystem.squashfs -noappend -e #{boot.root}/"
+      FileUtils::sudo "cp build/filesystem.squashfs #{mount_dir}/filesystem.squashfs"
     end
     FileUtils.touch file
   end
@@ -127,7 +91,7 @@ EOF
           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 debug"
+          f.puts "APPEND ro initrd=/initrd.img boot=local root=/boot/filesystem.squashfs rootflags=loop rootfstype=squashfs"
         end
       end
     end
@@ -162,4 +126,5 @@ EOF
     linux_partition_info = `/sbin/sfdisk -l #{file}`.scan(%r{#{file}.*Linux}).first
     linux_partition_info.split[5].to_i
   end
+
 end

data/lib/system_builder/init_ram_fs_configurator.rb

@@ -0,0 +1,63 @@
+class SystemBuilder::InitRamFsConfigurator 
+
+  def configure(chroot)
+    puts "* install initramfs-tools"
+    chroot.apt_install %w{initramfs-tools syslinux}
+
+    install_script(chroot, "local-top/mount_boot") do |f|
+      f.puts "modprobe loop"
+      f.puts "/lib/initrd/mount_boot"
+      # f.puts "PS1='(initramfs) ' /bin/sh -i </dev/console >/dev/console 2>&1"
+    end
+
+    install_script(chroot, "local-bottom/move_boot") do |f|
+      f.puts "mount -n -o move /boot /root/boot"
+    end
+
+    install_hook(chroot, "mount_boot") do |f|
+      f.puts "mkdir -p $DESTDIR/lib/initrd/"
+      f.puts "install -m 755 /usr/local/share/initramfs-tools/mount_boot $DESTDIR/lib/initrd/"
+    end
+
+    chroot.image.open("/etc/initramfs-tools/modules") do |f|
+      f.puts "squashfs"
+    end
+
+    chroot.image.mkdir "/usr/local/share/initramfs-tools"
+    chroot.image.open("/usr/local/share/initramfs-tools/mount_boot") do |f|
+      f.puts File.read("#{File.dirname(__FILE__)}/mount_boot.sh")
+    end
+
+    chroot.sudo "/usr/sbin/update-initramfs -u"
+  end
+
+  @@script_header = <<EOF
+#!/bin/sh -x
+if [ "$1" == "prereqs" ]; then
+  echo ""; exit 0;
+fi
+EOF
+
+  def install_script(chroot, name, &block)
+    install_file(chroot, :script, name, &block)
+  end
+
+  def install_hook(chroot, name, &block)
+    install_file(chroot, :hook, name) do |f|
+      f.puts ". /usr/share/initramfs-tools/hook-functions"
+      yield f
+    end
+  end
+
+  def install_file(chroot, type, name, &block)
+    file = "/usr/share/initramfs-tools/#{type}s/#{name}"
+    chroot.image.mkdir File.dirname(file)
+    chroot.image.open(file) do |f|
+      f.puts @@script_header
+      yield f
+      f.puts "exit 0"
+    end
+    chroot.sudo "chmod +x #{file}"
+  end
+
+end

data/lib/system_builder/iso_squashfs_image.rb

@@ -0,0 +1,53 @@
+require 'tempfile'
+
+class SystemBuilder::IsoSquashfsImage
+
+  attr_accessor :boot
+  attr_reader :file
+
+  def initialize(file)
+    @file = file
+  end
+
+  def create
+    boot.configurators << SystemBuilder::InitRamFsConfigurator.new
+    boot.create
+
+    compress_root_fs
+    install_isolinux_files
+    make_iso_fs
+
+    self
+  end
+
+  def compress_root_fs
+    FileUtils::sudo "mksquashfs #{boot.root}/ build/filesystem.squashfs -noappend -e /boot"
+  end
+
+  def install_isolinux_files(options = {})
+    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 initrd=/initrd.img boot=local root=/boot/filesystem.squashfs rootflags=loop rootfstype=squashfs"
+      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 "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 "chown $USER #{file}"
+  end
+  
+end

data/lib/system_builder/mount_boot.sh

@@ -0,0 +1,41 @@
+#!/bin/sh -x
+
+get_fstype() {
+	# udev >=146-1 no longer provides vol_id:
+	if [ -x /lib/udev/vol_id ]
+	then
+		/lib/udev/vol_id -t ${1} 2>/dev/null
+	else
+		eval $(blkid -o udev "${1}")
+		if [ -n "$ID_FS_TYPE" ]
+		then
+			echo "${ID_FS_TYPE}"
+		fi
+	fi
+}
+
+list_devices() {
+    # list partitions first
+    (ls /dev/hd*[1-9] /dev/sd*[1-9] ; ls /dev/hd[a-z] /dev/sd[a-z]) 2> /dev/null
+}
+
+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
+        ext3|iso9660)
+            mount -r -t $fs_type $device /boot
+            if [ -f "/boot/config.pp" ]; then
+                exit 0
+            else
+                umount /boot
+            fi
+            ;;
+    esac
+done
+
+echo "no image found"
+exit 1

data/lib/system_builder.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module SystemBuilder
-  VERSION = '0.0.7'
+  VERSION = '0.0.9'
 
   @@configurations = {}
   
@@ -22,6 +22,8 @@ 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'
+require 'system_builder/iso_squashfs_image'
 require 'system_builder/boot'
 require 'system_builder/configurator'

data/system-builder.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{system-builder}
-  s.version = "0.0.7"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alban Peignier"]
-  s.date = %q{2010-04-17}
+  s.date = %q{2010-05-09}
   s.default_executable = %q{system-builder}
   s.description = %q{FIX (describe your package)}
   s.email = ["alban@tryphon.eu"]
   s.executables = ["system-builder"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "bin/system-builder", "examples/Rakefile", "examples/config.rb", "examples/manifests/classes/test.pp", "examples/manifests/site.pp", "features/development.feature", "features/step_definitions/common_steps.rb", "features/support/common.rb", "features/support/env.rb", "features/support/matchers.rb", "lib/system_builder.rb", "lib/system_builder/boot.rb", "lib/system_builder/cli.rb", "lib/system_builder/configurator.rb", "lib/system_builder/core_ext.rb", "lib/system_builder/disk_image.rb", "lib/system_builder/disk_squashfs_image.rb", "lib/system_builder/iso_image.rb", "lib/system_builder/live_image.rb", "lib/system_builder/task.rb", "script/console", "script/destroy", "script/generate", "spec/spec.opts", "spec/spec_helper.rb", "spec/system_builder/boot_spec.rb", "spec/system_builder/cli_spec.rb", "system-builder.gemspec", "tasks/rspec.rake"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "bin/system-builder", "examples/Rakefile", "examples/config.rb", "examples/manifests/classes/test.pp", "examples/manifests/site.pp", "features/development.feature", "features/step_definitions/common_steps.rb", "features/support/common.rb", "features/support/env.rb", "features/support/matchers.rb", "lib/system_builder.rb", "lib/system_builder/boot.rb", "lib/system_builder/cli.rb", "lib/system_builder/configurator.rb", "lib/system_builder/core_ext.rb", "lib/system_builder/disk_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", "script/console", "script/destroy", "script/generate", "spec/spec.opts", "spec/spec_helper.rb", "spec/system_builder/boot_spec.rb", "spec/system_builder/cli_spec.rb", "system-builder.gemspec", "tasks/rspec.rake"]
   s.homepage = %q{http://projects.tryphon.eu/system-builder}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Alban Peignier
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 +02:00
+date: 2010-05-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,8 +79,11 @@ files:
 - lib/system_builder/core_ext.rb
 - lib/system_builder/disk_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
 - script/console
 - script/destroy