o/devicestate: cleanup system actions supported by recover mode #8686
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
Tweak the system actions to allow recovery mode system to enter reinstall or run modes. Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
pedronis
reviewed
May 18, 2020
| @@ -891,7 +908,7 @@ func (m *DeviceManager) Systems() ([]*System, error) { | |||
| } | |||
| if currentSys != nil && isCurrentSystem(currentSys, system) { | |||
There was a problem hiding this comment.
I still feel this should actually be integrated back in systemFromSeed by passing all the needed info in, but can be done when moving it to systems.go
There was a problem hiding this comment.
As discussed, we'll do this after #8689 lands.
| @@ -335,40 +335,38 @@ func (s *deviceMgrSystemsSuite) TestRequestSameModeSameSystem(c *C) { | |||
| s.state.Unlock() | |||
|
|
|||
| label := s.mockedSystemSeeds[0].label | |||
|
|
|||
| happyModes := []string{"run", "recover"} | |||
There was a problem hiding this comment.
shouldn't we have just moved recover to sadModes, are we not testing that?
There was a problem hiding this comment.
Yeah, silly me. I'll restore the test.
|
@bboozzoo is this related? |
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
…fferent seed Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
…rent modes Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
…ded-tweaks-cleaned-up-actions
|
The failure on 18.04 is unrelated: |
mvo5
approved these changes
May 20, 2020
| s.restartRequests = nil | ||
| s.bootloader.BootVars = map[string]string{} | ||
| } | ||
| s.testRequestModeWithRestart(c, []string{"install", "run"}, s.mockedSystemSeeds[0].label) |
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.
It does not make sense for recover mode to go boot into recover mode again.
This is stacked on top of #8672