system-builder 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.4 2009-10-10
+
+* Replace grub by syslinux
+* Disable invoke-rc.d during configuration
+
 === 0.0.2 2009-09-02
 
 * 1 major enhancement:

data/lib/system_builder/boot.rb

@@ -26,8 +26,10 @@ class SystemBuilder::DebianBoot
         apt_configurator, 
         kernel_configurator, 
         fstab_configurator, 
-        timezone_configurator ]
-    @cleaners = [ apt_cleaner ]
+        timezone_configurator,
+        policyrc_configurator
+      ]
+    @cleaners = [ apt_cleaner, policyrc_cleaner ]
   end
 
   def create
@@ -44,6 +46,7 @@ class SystemBuilder::DebianBoot
   end
 
   def configure
+    puts "* #{configurators.size} configurators to run :"
     unless @configurators.empty?
       chroot do |chroot|
         @configurators.each do |configurator|
@@ -65,15 +68,17 @@ class SystemBuilder::DebianBoot
 
   def kernel_configurator
     SystemBuilder::ProcConfigurator.new do |chroot|
+      puts "* install kernel"
       chroot.image.open("/etc/kernel-img.conf") do |f|
         f.puts "do_initrd = yes"
       end
-      chroot.apt_install %w{linux-image-2.6-686 grub}
+      chroot.apt_install %w{linux-image-2.6-686}
     end
   end
 
   def fstab_configurator
     SystemBuilder::ProcConfigurator.new do |chroot|
+      puts "* create fstab"
       chroot.image.open("/etc/fstab") do |f|
         %w{/tmp /var/run /var/log /var/lock /var/tmp}.each do |directory|
           f.puts "tmpfs #{directory} tmpfs defaults,noatime 0 0"
@@ -84,6 +89,7 @@ class SystemBuilder::DebianBoot
 
   def timezone_configurator
     SystemBuilder::ProcConfigurator.new do |chroot|
+      puts "* define timezone"
       # Use same timezone than build machine
       chroot.image.install "/etc/", "/etc/timezone", "/etc/localtime"
     end
@@ -92,14 +98,35 @@ class SystemBuilder::DebianBoot
   def apt_configurator
     # TODO see if this step is really needed
     SystemBuilder::ProcConfigurator.new do |chroot|    
+      puts "* install apt keys"
       chroot.image.install "/etc/apt", "/etc/apt/trusted.gpg"
       chroot.sudo "apt-get update"
     end
   end
 
+  def policyrc_configurator
+    SystemBuilder::ProcConfigurator.new do |chroot|    
+      puts "* disable rc services"
+      chroot.image.open("/usr/sbin/policy-rc.d") do |f|
+        f.puts "exit 101"
+      end
+      chroot.sh "chmod +x /usr/sbin/policy-rc.d"
+    end
+  end
+
   def apt_cleaner
     Proc.new do |chroot|
+      puts "* clean apt caches"
       chroot.sudo "apt-get clean"      
+      puts "* autoremove packages"
+      chroot.sudo "apt-get autoremove --yes"      
+    end
+  end
+
+  def policyrc_cleaner
+    Proc.new do |chroot|
+      puts "* enable rc services"
+      chroot.sh "rm /usr/sbin/policy-rc.d"
     end
   end
 
@@ -112,10 +139,6 @@ class SystemBuilder::DebianBoot
     end
   end
 
-  def configure(&block)
-    @configurators << SystemBuilder::ProcConfigurator.new(block)
-  end
-
   def debbootstrap_options
     {
       :arch => architecture,  

data/lib/system_builder/configurator.rb

@@ -21,6 +21,8 @@ module SystemBuilder
     end
 
     def configure(chroot)
+      puts "* run puppet configuration"
+
       chroot.apt_install :puppet
       chroot.image.open("/etc/default/puppet") do |f|
         f.puts "START=no"

data/lib/system_builder/image.rb

@@ -21,10 +21,10 @@ class SystemBuilder::DiskImage
       format_root_fs
     end
 
-    install_grub_files :stage_files => %w{e2fs_stage1_5 stage?}
+    install_extlinux_files
 
     sync_root_fs
-    install_grub if file_creation
+    install_extlinux
 
     self
   end
@@ -34,7 +34,8 @@ class SystemBuilder::DiskImage
   end
 
   def create_partition_table
-    FileUtils::sh "echo '63,' | /sbin/sfdisk --no-reread -uS -H16 -S63 #{file}"
+    # Partition must be bootable for syslinux
+    FileUtils::sh "echo '63,,L,*' | /sbin/sfdisk --no-reread -uS -H16 -S63 #{file}"
   end
 
   def format_root_fs
@@ -47,31 +48,64 @@ class SystemBuilder::DiskImage
     end
   end
 
-  def sync_root_fs
+  def mount_root_fs(&block)
+    # TODO use a smarter mount_dir
     mount_dir = "/tmp/mount_root_fs"
     FileUtils::mkdir_p mount_dir
-    
+
     begin
       FileUtils::sudo "mount -o loop,offset=#{fs_offset} #{file} #{mount_dir}"
-      FileUtils::sudo "rsync -av --delete #{boot.root}/ #{mount_dir}"
+      yield mount_dir
     ensure
       FileUtils::sudo "umount #{mount_dir}"
     end
+  end
 
+  def sync_root_fs
+    mount_root_fs do |mount_dir|
+      FileUtils::sudo "rsync -a --delete #{boot.root}/ #{mount_dir}"
+    end
     FileUtils.touch file
   end
 
+  def install_extlinux_files(options = {})
+    root = (options[:root] or "LABEL=#{fs_label}")
+    version = (options[:version] or Time.now.strftime("%Y%m%d%H%M"))
+
+    boot.image do |image|
+      image.mkdir "/boot/extlinux"
+
+      boot.image.open("/boot/extlinux/extlinux.conf") do |f|
+        f.puts "DEFAULT linux"
+        f.puts "LABEL linux"
+        f.puts "SAY Now booting #{version} from syslinux ..."
+        f.puts "KERNEL /vmlinuz"
+        f.puts "APPEND ro root=#{root} initrd=/initrd.img"
+      end
+    end
+  end
+
   def install_grub_files(options = {})
     stage_files = Array(options[:stage_files]).flatten
 
     boot.image do |image|
       image.mkdir "/boot/grub"
 
-      install_grub_menu options  
+      install_grub_menu options
       image.install "boot/grub", stage_files.collect { |f| '/usr/lib/grub/**/' + f }
     end
   end
 
+  def install_extlinux
+    # TODO install extlinux.sys only when needed
+    mount_root_fs do |mount_dir|
+      FileUtils::sudo "extlinux --install -H16 -S63 #{mount_dir}/boot/extlinux"
+    end
+    # TODO install mbr only when needed
+    # install MBR
+    FileUtils::sh "dd if=/usr/lib/syslinux/mbr.bin of=#{file} conv=notrunc"
+  end
+
   def install_grub
     IO.popen("sudo grub --device-map=/dev/null","w") { |grub| 
       grub.puts "device (hd0) #{file}"
@@ -104,7 +138,7 @@ class SystemBuilder::DiskImage
 
   def fs_block_size
     linux_partition_info = `/sbin/sfdisk -l #{file}`.scan(%r{#{file}.*Linux}).first
-    linux_partition_info.split[4].to_i
+    linux_partition_info.split[5].to_i
   end
 
   def fs_offset

data/lib/system_builder/task.rb

@@ -38,9 +38,9 @@ class SystemBuilder::Task < Rake::TaskLib
         required_packages << "sudo"
         required_packages << "debootstrap"
         required_packages << "rsync"
-        # installing grub isn't a good idea
-        # required_packages << "grub"
-
+        required_packages << "extlinux"
+        required_packages << "syslinux-common"
+        
         FileUtils.sudo "apt-get install #{required_packages.join(' ')}"
       end
     end

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.3'
+  VERSION = '0.0.4'
 
   @@configurations = {}
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: system-builder
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Alban Peignier
@@ -9,9 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 +01:00
+date: 2010-01-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -20,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.5.0
     version: 
 description: FIX (describe your package)
 email: