Change grub install method, run gru-install.

[osdn-codes/image-creator.git] / create-image

diff --git a/create-image b/create-image
index 29ba92d..96a4ead 100755 (executable)
--- a/create-image
+++ b/create-image
@@ -52,8 +52,7 @@ class ImageCreator
     if !use_gpt
       system("parted", "-s", path, "set", "1", "boot", "on") or raise "Failed to set bios boot partition"
     end
-    puts "Image partition created."
-    #system "sfdisk", "-l", path
+    puts "Image partition has been created."
   end
   
   def with_loopdev &block
@@ -113,17 +112,16 @@ class ImageCreator
   def fix_boot
     puts "Fixing boot environments..."
     Dir.mktmpdir("ci-#{$$}-#{name}") do |dir|
-      system("cp", "-a", "/usr/lib/grub/i386-pc/boot.img", dir) or raise "Failed to copy boot.img"
-      coreimg = "#{dir}/core.img"
-      system("grub-mkimage", "-o", coreimg, "-O", "i386-pc", "-p", "(hd0,msdos1)/boot/grub", "biosdisk", "part_msdos", "ext2", "gzio", "xzio", "lzopio") or raise "Failed to create grub core image."
       with_loopdev do |devices|
         puts "Override grub with host version..."
         root_dev = "/dev/#{devices.first[/loop\d+/]}"
-        system("grub-bios-setup", "-d", dir, root_dev) or raise "Failed to run grub-bios-setup"
         rootfs_uuid = dirs.find { |d| d.path == '/'}.fs_uuid
         puts "New rootfs UUID=#{rootfs_uuid}"
         begin
           system("mount", devices.first, dir) or raise "Failed to mount #{devices.first} to #{dir}"
+          system("mount", "--bind", "/dev", "#{dir}/dev") or raise "Failed to mount /dev to #{dir}/dev"
+          system("mount", "--bind", "/proc", "#{dir}/proc") or raise "Failed to mount /proc to #{dir}/proc"
+
           dirs[1..-1].each_with_index do |di, idx|
             system "mkdir", "-p", "#{dir}#{di.path}"
             system("mount", di.device, "#{dir}#{di.path}") or raise "Failed to mount #{di.device} to #{dir}#{path}"
@@ -144,30 +142,19 @@ class ImageCreator
             system("chroot", dir, "apt-get", "-y", "install", "linux-image-amd64")
           end
 
-          puts "Update grub.cfg..."
-          system("mkdir", "-p", "#{dir}/boot/grub/i386-pc") or raise "Failed to create grub dir"
-          system("cp -a /usr/lib/grub/i386-pc/*.mod #{dir}/boot/grub/i386-pc/") or raise "Failed to copy grub modules"
-          if File.exists? "#{dir}/boot/grub/grub.cfg"
-            grubconf = File.read "#{dir}/boot/grub/grub.cfg"
-            if old_uuid = grubconf[/root=UUID=(\S+)/, 1]
-              File.write "#{dir}/boot/grub/grub.cfg", grubconf.gsub(/#{old_uuid}/, rootfs_uuid)
-            end
-          else
-            system("chroot", dir, "apt-get", "-qy", "update")
+          puts "Update grub..."
+          unless File.exists? "#{dir}/boot/grub/grub.cfg"
+            system("chroot", dir, "apt-get", "-qy", "update") or raise "Failed to install grub-pc"
             system({'DEBIAN_FRONTEND' => 'noninteractive'}, "chroot", dir, "apt-get", "-y", "install", "grub-pc")
-            File.write "#{dir}/boot/grub/grub.cfg", <<-EOC
-              set timeout=5
-              insmod part_msdos
-              insmod ext2
-              insmod linux
-              search --no-floppy --fs-uuid --set=root #{rootfs_uuid}
-              menuentry 'Linux' {
-                linux   /vmlinuz root=UUID=#{rootfs_uuid} ro
-                initrd  /initrd.img
-              }
-            EOC
           end
+          File.open "#{dir}/boot/grub/device.map", "w" do |f|
+            f.puts "(hd0)\t#{root_dev}"
+          end
+          system("chroot", dir, "grub-mkconfig", "-o", "/boot/grub/grub.cfg") or raise "grub-mkconfig fails."
+          system(*%W(grub-install --no-floppy --grub-mkdevicemap=#{dir}/boot/grub/device.map --root-directory=#{dir} #{root_dev})) or raise "grub-install failed."
         ensure
+          system("umount", "#{dir}/dev")
+          system("umount", "#{dir}/proc")
           dirs.reverse[0..-2].each do |di, idx|
             system("umount", "#{dir}#{di.path}")
           end