diff --git a/pkg/action/common.go b/pkg/action/common.go index ba6f0b2..e997df4 100644 --- a/pkg/action/common.go +++ b/pkg/action/common.go @@ -19,17 +19,13 @@ package action import ( v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" "github.com/kairos-io/kairos-agent/v2/pkg/utils" - "github.com/sirupsen/logrus" ) // Hook is RunStage wrapper that only adds logic to ignore errors // in case v1.RunConfig.Strict is set to false func Hook(config *v1.Config, hook string, strict bool, cloudInitPaths ...string) error { config.Logger.Infof("Running %s hook", hook) - oldLevel := config.Logger.GetLevel() - config.Logger.SetLevel(logrus.ErrorLevel) err := utils.RunStage(config, hook, strict, cloudInitPaths...) - config.Logger.SetLevel(oldLevel) if !strict { err = nil } diff --git a/pkg/elementalConfig/config.go b/pkg/elementalConfig/config.go index 2a1c585..dd4d977 100644 --- a/pkg/elementalConfig/config.go +++ b/pkg/elementalConfig/config.go @@ -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 // 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