From a3452b4cfaa21f64db9355e38fbb06eaced55bab Mon Sep 17 00:00:00 2001 From: Itxaka Date: Tue, 1 Oct 2024 16:15:53 +0200 Subject: [PATCH] Try to get the flavor on EFI installs (#568) --- pkg/utils/grub.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkg/utils/grub.go b/pkg/utils/grub.go index 470b2d5b..eb9f40e1 100644 --- a/pkg/utils/grub.go +++ b/pkg/utils/grub.go @@ -176,6 +176,18 @@ func (g Grub) Install(target, rootDir, bootDir, grubConf, tty string, efi bool, if err != nil { g.config.Logger.Warnf("Failed reading os-release from %s: %v", filepath.Join(cnst.ActiveDir, "etc/os-release"), err) } + if flavor == "" { + // If os-release is gone with our vars, we dont know what flavor are we in, we should know if we are on ubuntu as we need + // a workaround for the grub efi install + // So lets try to get the info from the normal keys shipped with the os + flavorFromId, err := utils.OSRelease("ID", filepath.Join(cnst.ActiveDir, "etc/os-release")) + if err != nil { + g.config.Logger.Logger.Err(err).Msg("Getting flavor") + } + if strings.Contains(strings.ToLower(flavorFromId), "ubuntu") { + flavor = "ubuntu" + } + } g.config.Logger.Debugf("Detected Flavor: %s", flavor) // Copy needed files for efi boot // This seems like a chore while we could provide a package for those bundled files as they are just a shim and a grub efi