Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.0.x cherry-picks #1660

Merged
merged 3 commits into from
Aug 28, 2024
Merged

4.0.x cherry-picks #1660

merged 3 commits into from
Aug 28, 2024

Conversation

kacf
Copy link
Member

@kacf kacf commented Aug 27, 2024

No description provided.

…flash.

Changelog: Title
Ticket: None

Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
(cherry picked from commit 46dd249)
Changelog(docs): Clarify in the update module protocol documentation that
going into `ArtifactRollback` is still possible after an
`ArtifactCommit`, and it must still roll back successfully. While this
may seem like it introduces new requirements into a stable protocol,
it's important to remember that this was always possible, if the
device lost power after having run the steps inside `ArtifactCommit`,
but before the device could record having done so. In this case
`ArtifactRollback` would be the next step, so this is just formalizing
this possibility and subsequent requirement.

Changelog: Title
Ticket: None

Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
(cherry picked from commit ea0a6ce)
The `sync` command supports arguments on Linux, so use that to sync
only what we need, instead of all filesystems.

I also tested it on busybox, and it ignores the arguments, but still
works (just syncs everything, like if there were no arguments).

Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
(cherry picked from commit b229f7c)
@mender-test-bot
Copy link

Merging these commits will result in the following changelog entries:

Changelogs

mender (4.0.x)

New changes in mender since 4.0.x:

Bug Fixes
  • rootfs-image: Add missing filesystem sync when not using mender-flash.
  • rootfs-image: Make it safe to roll back after ArtifactCommit.
Other
  • Clarify in the update module protocol documentation that
    going into ArtifactRollback is still possible after an
    ArtifactCommit, and it must still roll back successfully. While this
    may seem like it introduces new requirements into a stable protocol,
    it's important to remember that this was always possible, if the
    device lost power after having run the steps inside ArtifactCommit,
    but before the device could record having done so. In this case
    ArtifactRollback would be the next step, so this is just formalizing
    this possibility and subsequent requirement.

@mender-test-bot
Copy link

@kacf, Let me know if you want to start the integration pipeline by mentioning me and the command "start pipeline".


my commands and options

You can trigger a pipeline on multiple prs with:

  • mentioning me and start pipeline --pr mender/127 --pr mender-connect/255

You can start a fast pipeline, disabling full integration tests with:

  • mentioning me and start pipeline --fast

You can trigger GitHub->GitLab branch sync with:

  • mentioning me and sync

You can cherry pick to a given branch or branches with:

  • mentioning me and:
 cherry-pick to:
 * 1.0.x
 * 2.0.x

@kacf kacf merged commit 652cd97 into mendersoftware:4.0.x Aug 28, 2024
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants