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

update_engine/bootengine: Clean up incomplete move target #1272

Merged
merged 1 commit into from
Oct 16, 2023

Conversation

pothos
Copy link
Member

@pothos pothos commented Oct 13, 2023

This pulls in flatcar/update_engine#29 and flatcar/bootengine#76
to fix the problem of not being able to update from ≤ 3619.0.0 on Azure.

How to use

Backport to Alpha/Beta because this fixes the problem of not being able to update from ≤ 3619.0.0

Testing done

Jenkins
Provision Flatcar Azure 3619.0.0, then update once, e.g. sudo flatcar-update -V 3732.0.0, then update to this built dev image and it should work (sudo flatcar-update -P flatcar_test_update.gz -E flatcar_test_update-oem-azure.gz -D -V 1.2.3), while updating to 3745.0.0 or 3732.1.0 (must not the version you are on) would fail and fill the OEM disk.

This also tested the bootengine PR because it will try to move the dev sysext to the OEM partition as active OEM sysext but that fails because the old OEM files only get deleted at the end of the preparations. Moving the inactive prod OEM sysext out would normally be done and could have created enough space but in this case not because the symlink under /etc isn't set up and we don't mount the inactive /usr to find out what version it is. Hence the moval of the active OEM only happens after the next boot.

  • Changelog entries added in the respective changelog/ directory (user-facing change, bug fix, security fix, update)
  • Inspected CI output for image differences: /boot and /usr size, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.

@pothos
Copy link
Member Author

pothos commented Oct 13, 2023

I didn't bump the ebuild revision because it always creates conflicts when backporting.

@github-actions
Copy link

github-actions bot commented Oct 13, 2023

Build action triggered: https://github.com/flatcar/scripts/actions/runs/6533079643

@krnowak
Copy link
Member

krnowak commented Oct 16, 2023

I didn't bump the ebuild revision because it always creates conflicts when backporting.

I know it's a PITA, but we already had weird problems due to not bumping the revisions, so please do bump them. I'm wondering though if by dropping the 9999 version and having a regular file instead of a symlink, it would make it easier for git to figure out how to do the right thing during backporting.

@dongsupark dongsupark added bug Something isn't working alpha beta stable and removed stable labels Oct 16, 2023
This pulls in flatcar/update_engine#29 and
flatcar/bootengine#76
to fix the problem of not being able to update from ≤ 3619.0.0 on Azure.
Copy link
Member

@krnowak krnowak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the PR with the commit hashes from merged PRs. Pulling it in into the main branch for the release this week.

@krnowak krnowak merged commit 16c7455 into main Oct 16, 2023
1 check failed
krnowak added a commit that referenced this pull request Oct 16, 2023
update_engine/bootengine: Clean up incomplete move target
@krnowak
Copy link
Member

krnowak commented Oct 16, 2023

For now, backported to alpha only. Probably no point in backporting to beta, as we will do a new beta release from current alpha release this week, so 3732 becomes dead.

@krnowak krnowak deleted the kai/postinst-mv-clean branch October 16, 2023 11:35
@pothos
Copy link
Member Author

pothos commented Oct 16, 2023

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
alpha bug Something isn't working main
Projects
None yet
3 participants