Commit: eeef32301ae67661655f8ff72fa6c96eaa83bcef - image-creator (git)

KVM host image creator.Jessica Lockwood

Commit MetaInfo

• Revisión: eeef32301ae67661655f8ff72fa6c96eaa83bcef (tree)
• Tiempo: 2020-06-28 01:27:41
• Autor: Tatsuki SUGIURA <sugi@osdn...>
• Commiter: Tatsuki SUGIURA

Log Message

Fix grub-pc detection for squeeze...

Cambiar Resumen

• modified: create-image

Diferencia incremental

--- a/create-image
+++ b/create-image
@@ -156,7 +156,7 @@ class ImageCreator
           if File.exists? "#{dir}/var/lib/dpkg/info/grub-efi-amd64.list"
             system({'DEBIAN_FRONTEND' => 'noninteractive'}, "chroot", dir, "apt", "remove", "--purge", "-y", "grub-efi-amd64") or raise "Failed to purge grub-efi"
           end
-          unless File.exists?("#{dir}/var/lib/dpkg/info/grub-pc.list") && File.exists?("#{dir}/usr/sbin/grub-bios-setup")
+          if !File.exists?("#{dir}/var/lib/dpkg/info/grub-pc.list") || !(File.exists?("#{dir}/usr/sbin/grub-bios-setup") || File.exists?("#{dir}/usr/sbin/grub-setup"))
             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")
           end