OSDN Git Service

Fix grub-pc install.
authorTatsuki SUGIURA <sugi@osdn.jp>
Tue, 9 Jun 2020 07:06:37 +0000 (16:06 +0900)
committerTatsuki SUGIURA <sugi@osdn.jp>
Tue, 9 Jun 2020 07:06:37 +0000 (16:06 +0900)
create-image

index 7257853..0c4b2a9 100755 (executable)
@@ -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
           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"
+          unless File.exists?("#{dir}/var/lib/dpkg/info/grub-pc.list") && File.exists?("#{dir}/usr/sbin/grub-bios-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
             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