system-builder 0.0.5 → 0.0.6

data/lib/system_builder/boot.rb

@@ -27,6 +27,7 @@ class SystemBuilder::DebianBoot
         kernel_configurator, 
         fstab_configurator, 
         timezone_configurator,
+        resolvconf_configurator,
         policyrc_configurator
       ]
     @cleaners = [ apt_cleaner, policyrc_cleaner ]
@@ -80,6 +81,7 @@ class SystemBuilder::DebianBoot
     SystemBuilder::ProcConfigurator.new do |chroot|
       puts "* create fstab"
       chroot.image.open("/etc/fstab") do |f|
+        f.puts "LABEL=boot /boot vfat defaults,noatime 0 1"
         %w{/tmp /var/run /var/log /var/lock /var/tmp}.each do |directory|
           f.puts "tmpfs #{directory} tmpfs defaults,noatime 0 0"
         end
@@ -95,6 +97,16 @@ class SystemBuilder::DebianBoot
     end
   end
 
+  def resolvconf_configurator
+    SystemBuilder::ProcConfigurator.new do |chroot|
+      unless chroot.image.exists?("/etc/resolv.conf")
+        puts "* define resolv.conf"
+        # Use the same resolv.conf than build machine
+        chroot.image.install "/etc/", "/etc/resolv.conf" 
+      end
+    end
+  end
+
   def apt_configurator
     # TODO see if this step is really needed
     SystemBuilder::ProcConfigurator.new do |chroot|    
@@ -197,6 +209,11 @@ class SystemBuilder::DebianBoot
       File.join(@root,path)
     end
 
+    def exists?(path)
+      path = expand_path(path)
+      File.exists?(path) or File.symlink?(path)
+    end
+
   end
 
   class Chroot

data/lib/system_builder/image.rb

@@ -18,13 +18,17 @@ class SystemBuilder::DiskImage
     if file_creation
       create_file
       create_partition_table
+
+      format_boot_fs
       format_root_fs
     end
 
-    install_extlinux_files
+    install_syslinux_files
 
+    sync_boot_fs
     sync_root_fs
-    install_extlinux
+
+    install_syslinux
 
     self
   end
@@ -35,14 +39,24 @@ class SystemBuilder::DiskImage
 
   def create_partition_table
     # Partition must be bootable for syslinux
-    FileUtils::sh "echo '63,,L,*' | /sbin/sfdisk --no-reread -uS -H16 -S63 #{file}"
+    FileUtils::sh "echo -e '#{free_sectors},#{boot_fs_sector_count},b,*\n#{boot_fs_sector_count+free_sectors},,L,' | /sbin/sfdisk --no-reread -uS -H16 -S63 #{file}"
   end
-
+ 
   def format_root_fs
     loop_device = "/dev/loop0"
     begin
-      FileUtils::sudo "losetup -o #{fs_offset} #{loop_device} #{file}"
-      FileUtils::sudo "mke2fs -L #{fs_label} -jqF #{loop_device} #{fs_block_size}"
+      FileUtils::sudo "losetup -o #{root_fs_offset} #{loop_device} #{file}"
+      FileUtils::sudo "mke2fs -L #{root_fs_label} -jqF #{loop_device} #{root_fs_block_size}"
+    ensure
+      FileUtils::sudo "losetup -d #{loop_device}"
+    end
+  end
+
+  def format_boot_fs
+    loop_device = "/dev/loop0"
+    begin
+      FileUtils::sudo "losetup -o #{boot_fs_offset} #{loop_device} #{file}"
+      FileUtils::sudo "mkdosfs -v -F 32 -n #{boot_fs_label} #{loop_device} #{boot_fs_block_size}"
     ensure
       FileUtils::sudo "losetup -d #{loop_device}"
     end
@@ -54,7 +68,20 @@ class SystemBuilder::DiskImage
     FileUtils::mkdir_p mount_dir
 
     begin
-      FileUtils::sudo "mount -o loop,offset=#{fs_offset} #{file} #{mount_dir}"
+      FileUtils::sudo "mount -o loop,offset=#{root_fs_offset} #{file} #{mount_dir}"
+      yield mount_dir
+    ensure
+      FileUtils::sudo "umount #{mount_dir}"
+    end
+  end
+
+  def mount_boot_fs(&block)
+    # TODO use a smarter mount_dir
+    mount_dir = "/tmp/mount_boot_fs"
+    FileUtils::mkdir_p mount_dir
+
+    begin
+      FileUtils::sudo "mount -o loop,offset=#{boot_fs_offset} #{file} #{mount_dir}"
       yield mount_dir
     ensure
       FileUtils::sudo "umount #{mount_dir}"
@@ -63,69 +90,41 @@ class SystemBuilder::DiskImage
 
   def sync_root_fs
     mount_root_fs do |mount_dir|
-      FileUtils::sudo "rsync -a --delete #{boot.root}/ #{mount_dir}"
+      FileUtils::sudo "rsync -a --delete --exclude='boot/**' #{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
+  def sync_boot_fs
+    mount_boot_fs do |mount_dir|
+      FileUtils::sudo "rsync -a --delete #{boot.root}/boot/ #{mount_dir}"
     end
+    FileUtils.touch file
   end
 
-  def install_grub_files(options = {})
-    stage_files = Array(options[:stage_files]).flatten
+  def install_syslinux_files(options = {})
+    root = (options[:root] or "LABEL=#{root_fs_label}")
+    version = (options[:version] or Time.now.strftime("%Y%m%d%H%M"))
 
     boot.image do |image|
-      image.mkdir "/boot/grub"
-
-      install_grub_menu options
-      image.install "boot/grub", stage_files.collect { |f| '/usr/lib/grub/**/' + f }
-    end
-  end
+      image.mkdir "/boot/"
 
-  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"
+      image.open("/boot/syslinux.cfg") do |f|
+        f.puts "default linux"
+        f.puts "label linux"
+        f.puts "kernel #{readlink_boot_file('vmlinuz')}"
+        f.puts "append ro root=#{root} initrd=#{readlink_boot_file('initrd.img')}"
+      end
     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}"
-      grub.puts "root (hd0,0)"
-      grub.puts "setup (hd0)"
-      grub.puts "quit"
-    }
+  def readlink_boot_file(boot_file)
+    File.basename(%x{readlink #{boot.root}/#{boot_file}}.strip)
   end
 
-  def install_grub_menu(options = {})
-    root = (options[:root] or "LABEL=#{fs_label}")
-    version = (options[:version] or Time.now.strftime("%Y%m%d%H%M"))
-
-    boot.image.open("/boot/grub/menu.lst") do |f|
-      f.puts "default 0"
-      f.puts "timeout 2"
-      f.puts "title #{version} Debian GNU/Linux"
-      f.puts "kernel /vmlinuz root=#{root} ro"
-      f.puts "initrd /initrd.img"
-    end
+  def install_syslinux
+    FileUtils::sh "syslinux -o #{boot_fs_offset} #{file}"
+    FileUtils::sh "dd if=/usr/lib/syslinux/mbr.bin of=#{file} conv=notrunc"
   end
 
   def convert(export_file, options = {})
@@ -136,17 +135,38 @@ class SystemBuilder::DiskImage
     end
   end
 
-  def fs_block_size
+  def root_fs_block_size
     linux_partition_info = `/sbin/sfdisk -l #{file}`.scan(%r{#{file}.*Linux}).first
+    linux_partition_info.split[4].to_i
+  end
+
+  def free_sectors
+    64
+  end
+
+  def boot_fs_offset
+    free_sectors * 512
+  end
+
+  def boot_fs_block_size
+    linux_partition_info = `/sbin/sfdisk -l #{file}`.scan(%r{#{file}.*W95 FAT32}).first
     linux_partition_info.split[5].to_i
   end
 
-  def fs_offset
-    32256
+  def boot_fs_sector_count
+    (120 * 1008) - free_sectors # end of partition on a multiple of 1008 (cylinder size)
+  end
+
+  def root_fs_offset
+    (free_sectors + boot_fs_sector_count) * 512
   end
 
-  def fs_label
+  def root_fs_label
     "root"
   end
 
+  def boot_fs_label
+    "boot"
+  end
+
 end

data/lib/system_builder/task.rb

@@ -38,8 +38,8 @@ class SystemBuilder::Task < Rake::TaskLib
         required_packages << "sudo"
         required_packages << "debootstrap"
         required_packages << "rsync"
-        required_packages << "extlinux"
-        required_packages << "syslinux-common"
+        required_packages << "dosfstools"
+        required_packages << "syslinux"
         
         FileUtils.sudo "apt-get install #{required_packages.join(' ')}"
       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.5'
+  VERSION = '0.0.6'
 
   @@configurations = {}
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: system-builder
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Alban Peignier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 +01:00
+date: 2010-02-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.4.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe