keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

postprocess: Use same rigor for bwrap as scripts in unified core mode

Browse Source 
This would have prevented corruption I saw when using unified core 🌐 mode; we
ended up appending repeatedly to the version in the imported pkgcache repo
where fedora-atomic does:
`echo 'Storage=persistent' >> /etc/systemd/journald.conf`

See also https://pagure.io/fedora-atomic/pull-request/97

Closes: #1151
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-12-13 22:31:17 -05:00 committed by Atomic Bot
parent 9f2db12329
commit fcb2a9d11f
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/libpriv/rpmostree-postprocess.c
View File

@ -66,26 +66,21 @@ run_bwrap_mutably (int rootfs_fd,
GCancellable *cancellable,
GError **error)
{
const char *etc_bind;
/* This gets called both by treecompose, where in the non-unified path we just
* have /etc, and in kernel postprocessing where we have usr/etc.
*/
if (!glnx_fstatat_allow_noent (rootfs_fd, "etc", NULL, 0, error))
return FALSE;
if (errno == ENOENT)
etc_bind = "usr/etc";
g_autoptr(RpmOstreeBwrap) bwrap = NULL;
if (unified_core_mode)
bwrap = rpmostree_bwrap_new (rootfs_fd,
RPMOSTREE_BWRAP_MUTATE_ROFILES,
error,
"--ro-bind", "./var", "/var",
NULL);
else
etc_bind = "etc";
bwrap = rpmostree_bwrap_new (rootfs_fd,
RPMOSTREE_BWRAP_MUTATE_FREELY,
error,
"--bind", "var", "/var",
"--bind", "usr/etc", "/etc",
NULL);
g_autoptr(RpmOstreeBwrap) bwrap =
rpmostree_bwrap_new (rootfs_fd,
unified_core_mode ? RPMOSTREE_BWRAP_MUTATE_ROFILES :
RPMOSTREE_BWRAP_MUTATE_FREELY,
error,
"--bind", "var", "/var",
"--bind", etc_bind, "/etc",
NULL);
if (!bwrap)
return FALSE;