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.

Sign up for GitHub

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

Revert "apply: Don't use staged deployments when /boot is automounted" #306

Merged
merged 2 commits into from
Sep 9, 2022
Merged

Revert "apply: Don't use staged deployments when /boot is automounted" #306

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44348e2
Revert "apply: Don't use staged deployments when /boot is automounted"
dbnicholson Sep 8, 2022
592fa69
Revert "libeos-updater-util: Add method to detect if /boot is an auto…
dbnicholson Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions eos-updater/apply.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,13 +270,11 @@ apply_internal (ApplyData *apply_data,

origin = ostree_sysroot_origin_new_from_refspec (sysroot, update_refspec);

/* When booted into an OSTree system without an automount /boot, stage the
* deployment so that the /etc merge happens during shutdown. Otherwise
* (primarily sd-boot and the test suite), deploy the finalized tree
* immediately.
/* When booted into an OSTree system, stage the deployment so that the
* /etc merge happens during shutdown. Otherwise (primarily the test
* suite), deploy the finalized tree immediately.
*/
staged_deploy = ostree_sysroot_is_booted (sysroot) &&
!eos_updater_sysroot_boot_is_automount (sysroot, NULL);
dbnicholson marked this conversation as resolved.
Show resolved Hide resolved
staged_deploy = ostree_sysroot_is_booted (sysroot);
if (staged_deploy)
{
g_message ("Creating staged deployment for revision %s", update_id);
Expand Down