rancher/immucore
1
0
Fork 0
mirror of https://github.com/kairos-io/immucore.git synced 2025-09-20 18:50:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return from cos-layout if recovery

Browse Source 
Signed-off-by: Itxaka <itxaka@spectrocloud.com>
This commit is contained in:
Itxaka
2023-02-08 21:19:57 +01:00
parent 0ea1650838
commit b2b870973c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/mount/mount.go
View File

@@ -104,7 +104,7 @@ func (s *State) RunStageOp(stage string) func(context.Context) error {
cmd := fmt.Sprintf("elemental run-stage %s", stage) cmd := fmt.Sprintf("elemental run-stage %s", stage)
log.Logger.Debug().Str("cmd", cmd).Msg("") log.Logger.Debug().Str("cmd", cmd).Msg("")
output, err := utils.SH(cmd) output, err := utils.SH(cmd)
log.Logger.Debug().Str("output", output).Msg("") log.Info().Msg(output)
return err return err
} }
} }
@@ -300,9 +300,14 @@ func (s *State) Register(g *herd.Graph) error {
herd.WithDeps(opRootfsHook), herd.WithDeps(opRootfsHook),
herd.WithCallback(func(ctx context.Context) error { herd.WithCallback(func(ctx context.Context) error {
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr}).With().Logger() log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr}).With().Logger()
if s.IsRecovery {
log.Info().Msg("We are on recovery, not reading cos-layout.env")
return nil
}
if s.CustomMounts == nil { if s.CustomMounts == nil {
s.CustomMounts = map[string]string{} s.CustomMounts = map[string]string{}
} }
env, err := readEnv("/run/cos/cos-layout.env") env, err := readEnv("/run/cos/cos-layout.env")
if err != nil { if err != nil {
log.Logger.Err(err).Msg("Reading env") log.Logger.Err(err).Msg("Reading env")