packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2673 from cgwalters/assert-boot 

sysroot: Add a few more assertions about `boot_fd`
This commit is contained in:
Colin Walters 2022-07-13 16:35:10 -04:00 committed by GitHub
parent 7e7a3df99b 60853219d5
commit 035b290210
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libostree/ostree-sysroot-deploy.c
View File

@ -1614,6 +1614,7 @@ full_system_sync (OstreeSysroot *self,
return FALSE; return FALSE;
start_msec = g_get_monotonic_time () / 1000; start_msec = g_get_monotonic_time () / 1000;
g_assert_cmpint (self->boot_fd, !=, -1);
if (!fsfreeze_thaw_cycle (self, self->boot_fd, cancellable, error)) if (!fsfreeze_thaw_cycle (self, self->boot_fd, cancellable, error))
return FALSE; return FALSE;
end_msec = g_get_monotonic_time () / 1000; end_msec = g_get_monotonic_time () / 1000;
@ -3526,6 +3527,7 @@ _ostree_sysroot_boot_complete (OstreeSysroot *self,
return FALSE; return FALSE;
glnx_autofd int failure_fd = -1; glnx_autofd int failure_fd = -1;
g_assert_cmpint (self->boot_fd, !=, -1);
if (!ot_openat_ignore_enoent (self->boot_fd, _OSTREE_FINALIZE_STAGED_FAILURE_PATH, &failure_fd, error)) if (!ot_openat_ignore_enoent (self->boot_fd, _OSTREE_FINALIZE_STAGED_FAILURE_PATH, &failure_fd, error))
return FALSE; return FALSE;
// If we didn't find a failure log, then there's nothing to do right now. // If we didn't find a failure log, then there's nothing to do right now.