Try to mount oem under livemedia #110
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Tested cloud images + recovery: works Missing testing netboot+iso boot, which should not trigger the oem mount but should pick the live_media DAG |
mudler
reviewed
Apr 12, 2023
pkg/mount/dag_uki_boot.go
Outdated
| @@ -20,7 +20,7 @@ func (s *State) RegisterUKI(g *herd.Graph) error { | |||
| s.LogIfError(s.UKIUdevDaemon(g), "udev") | |||
|
|
|||
| // Run rootfs stage | |||
| s.LogIfError(s.RootfsStageDagStep(g, cnst.OpSentinel, cnst.OpUkiUdev), "uki rootfs") | |||
| s.LogIfError(s.RootfsStageDagStep(g, herd.WithDeps(cnst.OpSentinel, cnst.OpUkiUdev), herd.WithWeakDeps()), "uki rootfs") | |||
There was a problem hiding this comment.
yes, signature of the call has changed to be able to pass an optional number of deps and weakdeps
mudler
reviewed
Apr 12, 2023
pkg/mount/dag_steps.go
Outdated
| @@ -102,8 +102,8 @@ func (s *State) MountRootDagStep(g *herd.Graph) error { | |||
| } | |||
|
|
|||
| // RootfsStageDagStep will add the rootfs stage. | |||
| func (s *State) RootfsStageDagStep(g *herd.Graph, deps ...string) error { | |||
| return g.Add(cnst.OpRootfsHook, herd.WithDeps(deps...), herd.WithCallback(s.RunStageOp("rootfs"))) | |||
| func (s *State) RootfsStageDagStep(g *herd.Graph, deps herd.OpOption, weakDeps herd.OpOption) error { | |||
There was a problem hiding this comment.
Suggested change
| func (s *State) RootfsStageDagStep(g *herd.Graph, deps herd.OpOption, weakDeps herd.OpOption) error { | |
| func (s *State) RootfsStageDagStep(g *herd.Graph, opts ...herd.OpOption) error { |
mudler
reviewed
Apr 12, 2023
pkg/mount/dag_steps.go
Outdated
| func (s *State) RootfsStageDagStep(g *herd.Graph, deps ...string) error { | ||
| return g.Add(cnst.OpRootfsHook, herd.WithDeps(deps...), herd.WithCallback(s.RunStageOp("rootfs"))) | ||
| func (s *State) RootfsStageDagStep(g *herd.Graph, deps herd.OpOption, weakDeps herd.OpOption) error { | ||
| return g.Add(cnst.OpRootfsHook, deps, weakDeps, herd.WithCallback(s.RunStageOp("rootfs"))) |
There was a problem hiding this comment.
Suggested change
| return g.Add(cnst.OpRootfsHook, deps, weakDeps, herd.WithCallback(s.RunStageOp("rootfs"))) | |
| return g.Add(cnst.OpRootfsHook, herd.WithCallback(s.RunStageOp("rootfs")), opts... ) |
There was a problem hiding this comment.
wait...can you pass the callback anywhere???
There was a problem hiding this comment.
nope, you cant:
Invalid use of '...', the corresponding parameter is non-variadic
There was a problem hiding this comment.
ah yes, you can but have to append the withCallback to the slice!
There was a problem hiding this comment.
argh yep I've messed it up while adding the suggestion
mudler
reviewed
Apr 12, 2023
pkg/mount/dag_uki_boot.go
Outdated
| @@ -20,7 +20,7 @@ func (s *State) RegisterUKI(g *herd.Graph) error { | |||
| s.LogIfError(s.UKIUdevDaemon(g), "udev") | |||
|
|
|||
| // Run rootfs stage | |||
| s.LogIfError(s.RootfsStageDagStep(g, cnst.OpSentinel, cnst.OpUkiUdev), "uki rootfs") | |||
| s.LogIfError(s.RootfsStageDagStep(g, herd.WithDeps(cnst.OpSentinel, cnst.OpUkiUdev), herd.WithWeakDeps()), "uki rootfs") | |||
There was a problem hiding this comment.
Suggested change
| s.LogIfError(s.RootfsStageDagStep(g, herd.WithDeps(cnst.OpSentinel, cnst.OpUkiUdev), herd.WithWeakDeps()), "uki rootfs") | |
| s.LogIfError(s.RootfsStageDagStep(g, herd.WithDeps(cnst.OpSentinel, cnst.OpUkiUdev)), "uki rootfs") |
mudler
approved these changes
Apr 12, 2023
Itxaka
force-pushed
the
oem_recovery_squash
branch
3 times, most recently
from
fd111ea
to
a4e1fd5
Compare
mudler
reviewed
Apr 12, 2023
pkg/mount/dag_steps.go
Outdated
| func (s *State) RootfsStageDagStep(g *herd.Graph, deps ...string) error { | ||
| return g.Add(cnst.OpRootfsHook, herd.WithDeps(deps...), herd.WithCallback(s.RunStageOp("rootfs"))) | ||
| func (s *State) RootfsStageDagStep(g *herd.Graph, opts ...herd.OpOption) error { | ||
| opts = append(opts, herd.WithCallback(s.RunStageOp("rootfs"))) |
There was a problem hiding this comment.
you know this can be a oneline.. :)
mudler
approved these changes
Apr 12, 2023
Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>
Itxaka
force-pushed
the
oem_recovery_squash
branch
from
a4e1fd5
to
7d0581c
Compare
Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>
|
Manually tested:
|
mudler
reviewed
Apr 12, 2023
| func (s *State) RootfsStageDagStep(g *herd.Graph, deps ...string) error { | ||
| return g.Add(cnst.OpRootfsHook, herd.WithDeps(deps...), herd.WithCallback(s.RunStageOp("rootfs"))) | ||
| func (s *State) RootfsStageDagStep(g *herd.Graph, opts ...herd.OpOption) error { | ||
| return g.Add(cnst.OpRootfsHook, append(opts, herd.WithCallback(s.RunStageOp("rootfs")))...) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows recovery squashfs to have oem mounted on boot so the stages runs correctly with user provided configs.