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

Fix depends for rootfs, proper path for layout

Browse Source 
Signed-off-by: Itxaka <itxaka@spectrocloud.com>
This commit is contained in:
Itxaka
2023-02-07 21:52:40 +01:00
parent b62a1f2e99
commit bd5c1f1f55
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/mount/mount.go
View File

@@ -274,24 +274,23 @@ func (s *State) Register(g *herd.Graph) error {
// This is building the mountRoot dependendency if it was enabled // This is building the mountRoot dependendency if it was enabled
mountRootCondition := herd.ConditionalOption(func() bool { return s.MountRoot }, herd.WithDeps(opMountRoot)) mountRootCondition := herd.ConditionalOption(func() bool { return s.MountRoot }, herd.WithDeps(opMountRoot))
// TODO: this needs to be run after state is discovered // TODO: this needs to be run after sysroot so we can link to /sysroot/system/oem and after /oem mounted
// TODO: add symlink if Rootdir != ""
// TODO: chroot?
s.Logger.Debug().Str("what", opRootfsHook).Msg("Add operation") s.Logger.Debug().Str("what", opRootfsHook).Msg("Add operation")
err = g.Add(opRootfsHook, mountRootCondition, herd.WithDeps(opMountRoot), herd.WithCallback(s.RunStageOp("rootfs"))) err = g.Add(opRootfsHook, mountRootCondition, herd.WithDeps(opMountRoot, opMountOEM), herd.WithCallback(s.RunStageOp("rootfs")))
if err != nil { if err != nil {
s.Logger.Err(err).Msg("") s.Logger.Err(err).Msg("running rootfs stage")
} }
// /run/cos-layout.env // /run/cos/cos-layout.env
// populate state bindmounts, overlaymounts, custommounts // populate state bindmounts, overlaymounts, custommounts
s.Logger.Debug().Str("what", opLoadConfig).Msg("Add operation") s.Logger.Debug().Str("what", opLoadConfig).Msg("Add operation")
err = g.Add(opLoadConfig, err = g.Add(opLoadConfig,
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().Caller().Logger() log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr}).With().Caller().Logger()
env, err := readEnv("/run/cos-layout.env") env, err := readEnv("/run/cos/cos-layout.env")
if err != nil { if err != nil {
s.Logger.Err(err).Msg("Reading env")
return err return err
} }
log.Logger.Debug().Str("envfile", litter.Sdump(env)).Msg("loading cos layout") log.Logger.Debug().Str("envfile", litter.Sdump(env)).Msg("loading cos layout")