kairos/kairos-agent
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-10-22 03:49:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(grub): add symlink workaround for LiveOS_rootfs (#939)

Browse Source
This commit is contained in:
Itxaka
2025-08-26 12:44:17 +02:00
committed by GitHub
parent 543a4630e2
commit 76b93ea50c
1 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pkg/utils/grub.go
View File

@@ -19,18 +19,19 @@ package utils
import (
"bytes"
"fmt"
agentConfig "github.com/kairos-io/kairos-agent/v2/pkg/config"
v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1"
"github.com/kairos-io/kairos-agent/v2/pkg/utils/fs"
"github.com/kairos-io/kairos-sdk/utils"
"io/fs"
"os"
"path/filepath"
"sort"
"strings"
agentConfig "github.com/kairos-io/kairos-agent/v2/pkg/config"
"github.com/kairos-io/kairos-agent/v2/pkg/constants"
cnst "github.com/kairos-io/kairos-agent/v2/pkg/constants"
v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1"
"github.com/kairos-io/kairos-agent/v2/pkg/utils/fs"
"github.com/kairos-io/kairos-sdk/state"
"github.com/kairos-io/kairos-sdk/utils"
)
// Grub is the struct that will allow us to install grub to the target device
@@ -60,6 +61,37 @@ func (g Grub) Install(target, rootDir, bootDir, grubConf, tty string, efi bool,
// only install grub on non-efi systems
if !efi {
// Workaround for livecd installs where the root dir is identified as LiveOS_rootfs
// some grub versions try to probe the system and fail as they cant find anything linked to that name
// so we create a symlink to the COS_STATE partition so grub can probe the target disk properly and then remove it
// The path is CWD/LiveOS_rootfs so we need to get the CWD and create the symlink there
r, _ := state.NewRuntimeWithLogger(g.config.Logger.Logger)
if r.BootState == state.LiveCD {
// get the current dir
currentDir, err := os.Getwd()
if err != nil {
g.config.Logger.Warnf("Failed getting current dir: %s", err)
return err
}
liveOsDir := filepath.Join(currentDir, "LiveOS_rootfs")
// Now create the symlink (source, target)
err = g.config.Fs.Symlink(filepath.Join("/dev/disk/by-label/", cnst.StateLabel), liveOsDir)
if err != nil {
g.config.Logger.Warnf("Failed creating liveos symlink: %s", err)
return err
}
// Remove the symlink at the end
defer func() {
err = g.config.Fs.Remove(liveOsDir)
if err != nil {
g.config.Logger.Warnf("Failed removing liveos symlink: %s", err)
}
}()
}
g.config.Logger.Info("Installing GRUB..")
// Find where in the rootDir the grub2 files for i386-pc are
@@ -74,7 +106,7 @@ func (g Grub) Install(target, rootDir, bootDir, grubConf, tty string, efi bool,
grubargs,
fmt.Sprintf("--directory=%s", grubdir),
fmt.Sprintf("--boot-directory=%s", bootDir),
"--target=i386-pc",
"--target=i386-pc", "-v",
target,
)