Commit: 324052eadf9f578b23c09867c0546f2859dc78a9 - image-creator (git)

KVM host image creator.Jessica Lockwood

Commit MetaInfo

• Revisão: 324052eadf9f578b23c09867c0546f2859dc78a9 (tree)
• Hora: 2020-06-28 23:42:38
• Autor: Tatsuki SUGIURA <sugi@osdn...>
• Commiter: Tatsuki SUGIURA

Mensagem de Log

Fix order to enable grub config rewrite.

Mudança Sumário

• modified: create-image

Diff

--- a/create-image
+++ b/create-image
@@ -166,15 +166,16 @@ class ImageCreator
           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."
-          cfg = File.read "#{dir}/boot/grub/grub.cfg"
-          cfg.gsub! %r{mapper/loop\d+p}, "sda"
-          File.write "#{dir}/boot/grub/grub.cfg", cfg
 
           unless Array(run_cmds).empty?
             Array(run_cmds).each do |cmd|
               system({'DEBIAN_FRONTEND' => 'noninteractive'}, "chroot", dir, *Array(cmd)) or raise "Failed to execute command (#{cmd}): #{$!}"
             end
           end
+
+          cfg = File.read "#{dir}/boot/grub/grub.cfg"
+          cfg.gsub! %r{mapper/loop\d+p}, "sda"
+          File.write "#{dir}/boot/grub/grub.cfg", cfg
         ensure
           system("umount", "#{dir}/dev")
           system("umount", "#{dir}/proc")