github/kairos-agent
7
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-06-03 01:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #249 from kairos-io/bootentry_fixes

Browse Source 
Fix bootentries grub in opensuse
This commit is contained in:
Dimitris Karakasilis 2024-03-15 16:04:07 +02:00 committed by GitHub
commit 5803280679
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/action/bootentries.go
View File

@ -292,13 +292,14 @@ func listSystemdEntries(cfg *config.Config, efiPartition *v1.Partition) ([]strin
// listGrubEntries reads the grub config files and returns a list of entries found // listGrubEntries reads the grub config files and returns a list of entries found
func listGrubEntries(cfg *config.Config) ([]string, error) { func listGrubEntries(cfg *config.Config) ([]string, error) {
// Read grub config from 3 places // Read grub config from 4 places
// /etc/cos/grub.cfg // /etc/cos/grub.cfg
// /run/initramfs/cos-state/grub/grub.cfg // /run/initramfs/cos-state/grub/grub.cfg
// /run/initramfs/cos-state/grub2/grub.cfg
// /etc/kairos/branding/grubmenu.cfg // /etc/kairos/branding/grubmenu.cfg
// And grep the entries by checking the --id\s([A-z0-9]*)\s{ pattern // And grep the entries by checking the --id\s([A-z0-9]*)\s{ pattern
var entries []string var entries []string
for _, file := range []string{"/etc/cos/grub.cfg", "/run/initramfs/cos-state/grub/grub.cfg", "/etc/kairos/branding/grubmenu.cfg"} { for _, file := range []string{"/etc/cos/grub.cfg", "/run/initramfs/cos-state/grub/grub.cfg", "/etc/kairos/branding/grubmenu.cfg", "/run/initramfs/cos-state/grub2/grub.cfg"} {
f, err := cfg.Fs.ReadFile(file) f, err := cfg.Fs.ReadFile(file)
if err != nil { if err != nil {
cfg.Logger.Errorf("could not read file %s: %s", file, err) cfg.Logger.Errorf("could not read file %s: %s", file, err)