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

Fix oem mountpoint not available on upgrade (#85)

Browse Source
This commit is contained in:
Itxaka 2023-07-19 09:46:30 +02:00 committed by GitHub
parent 9a16b94e2a
commit 4bc5ea1cfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/action/common.go
View File

@ -19,17 +19,13 @@ package action
import ( import (
v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1"
"github.com/kairos-io/kairos-agent/v2/pkg/utils" "github.com/kairos-io/kairos-agent/v2/pkg/utils"
"github.com/sirupsen/logrus"
) )
// Hook is RunStage wrapper that only adds logic to ignore errors // Hook is RunStage wrapper that only adds logic to ignore errors
// in case v1.RunConfig.Strict is set to false // in case v1.RunConfig.Strict is set to false
func Hook(config *v1.Config, hook string, strict bool, cloudInitPaths ...string) error { func Hook(config *v1.Config, hook string, strict bool, cloudInitPaths ...string) error {
config.Logger.Infof("Running %s hook", hook) config.Logger.Infof("Running %s hook", hook)
oldLevel := config.Logger.GetLevel()
config.Logger.SetLevel(logrus.ErrorLevel)
err := utils.RunStage(config, hook, strict, cloudInitPaths...) err := utils.RunStage(config, hook, strict, cloudInitPaths...)
config.Logger.SetLevel(oldLevel)
if !strict { if !strict {
err = nil err = nil
} }

5
pkg/elementalConfig/config.go
View File

@ -369,6 +369,11 @@ func NewUpgradeSpec(cfg v1.Config) (*v1.UpgradeSpec, error) {
} }
} }
// If we have oem in the system, but it has no mountpoint
if ep.OEM != nil && ep.OEM.MountPoint == "" {
// Add the default mountpoint for it in case the chroot stages want to bind mount it
ep.OEM.MountPoint = constants.OEMPath
}
// This is needed if we want to use the persistent as tmpdir for the upgrade images // This is needed if we want to use the persistent as tmpdir for the upgrade images
// as tmpfs is 25% of the total RAM, we cannot rely on the tmp dir having enough space for our image // as tmpfs is 25% of the total RAM, we cannot rely on the tmp dir having enough space for our image
// This enables upgrades on low ram devices // This enables upgrades on low ram devices