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

core: Use ADD_FILES checkout mode for "setup"

Browse Source 
Prep for unified core 🌐.  On the treecompose path we inject
`/usr/etc/passwd`, and trying to overlay the setup package on top
with the default `UNION_IDENTICAL` fails.

This is obviously a hack; but I can't think of a way to do this significantly
better. (We could do a DB query for the owner of `/etc/passwd`, but eh.)

Closes: #1098
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-11-09 12:59:44 -05:00 committed by Atomic Bot
parent 00fab1ec23
commit 5735e23a0f
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libpriv/rpmostree-core.c
View File

@ -2082,11 +2082,12 @@ checkout_package (OstreeRepo *repo,
const char *path, const char *path,
OstreeRepoDevInoCache *devino_cache, OstreeRepoDevInoCache *devino_cache,
const char *pkg_commit, const char *pkg_commit,
OstreeRepoCheckoutOverwriteMode ovwmode,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
OstreeRepoCheckoutAtOptions opts = { OSTREE_REPO_CHECKOUT_MODE_USER, OstreeRepoCheckoutAtOptions opts = { OSTREE_REPO_CHECKOUT_MODE_USER,
OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL, }; ovwmode, };
/* We want the checkout to match the repo type so that we get hardlinks. */ /* We want the checkout to match the repo type so that we get hardlinks. */
if (ostree_repo_get_mode (repo) == OSTREE_REPO_MODE_BARE) if (ostree_repo_get_mode (repo) == OSTREE_REPO_MODE_BARE)
@ -2111,6 +2112,7 @@ checkout_package_into_root (RpmOstreeContext *self,
const char *path, const char *path,
OstreeRepoDevInoCache *devino_cache, OstreeRepoDevInoCache *devino_cache,
const char *pkg_commit, const char *pkg_commit,
OstreeRepoCheckoutOverwriteMode ovwmode,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
@ -2127,7 +2129,7 @@ checkout_package_into_root (RpmOstreeContext *self,
} }
if (!checkout_package (pkgcache_repo, pkg, dfd, path, if (!checkout_package (pkgcache_repo, pkg, dfd, path,
devino_cache, pkg_commit, devino_cache, pkg_commit, ovwmode,
cancellable, error)) cancellable, error))
return FALSE; return FALSE;
@ -2404,7 +2406,8 @@ relabel_one_package (RpmOstreeContext *self,
g_autoptr(OstreeRepoDevInoCache) cache = ostree_repo_devino_cache_new (); g_autoptr(OstreeRepoDevInoCache) cache = ostree_repo_devino_cache_new ();
if (!checkout_package (repo, pkg, tmpdir_dfd, pkg_dirname, cache, if (!checkout_package (repo, pkg, tmpdir_dfd, pkg_dirname, cache,
commit_csum, cancellable, error)) commit_csum, OSTREE_REPO_CHECKOUT_OVERWRITE_NONE,
cancellable, error))
return FALSE; return FALSE;
/* This is where the magic happens. We traverse the tree and relabel stuff, /* This is where the magic happens. We traverse the tree and relabel stuff,
@ -2975,7 +2978,8 @@ rpmostree_context_assemble (RpmOstreeContext *self,
TransactionData tdata = { 0, NULL }; TransactionData tdata = { 0, NULL };
g_autoptr(GHashTable) pkg_to_ostree_commit = g_autoptr(GHashTable) pkg_to_ostree_commit =
g_hash_table_new_full (NULL, NULL, (GDestroyNotify)g_object_unref, (GDestroyNotify)g_free); g_hash_table_new_full (NULL, NULL, (GDestroyNotify)g_object_unref, (GDestroyNotify)g_free);
DnfPackage *filesystem_package = NULL; /* It's special... */ DnfPackage *filesystem_package = NULL; /* It's special, see below */
DnfPackage *setup_package = NULL; /* Also special due to composes needing to inject /etc/passwd */
g_auto(rpmts) ordering_ts = rpmtsCreate (); g_auto(rpmts) ordering_ts = rpmtsCreate ();
rpmtsSetRootDir (ordering_ts, dnf_context_get_install_root (hifctx)); rpmtsSetRootDir (ordering_ts, dnf_context_get_install_root (hifctx));
@ -3040,6 +3044,8 @@ rpmostree_context_assemble (RpmOstreeContext *self,
if (strcmp (dnf_package_get_name (pkg), "filesystem") == 0) if (strcmp (dnf_package_get_name (pkg), "filesystem") == 0)
filesystem_package = g_object_ref (pkg); filesystem_package = g_object_ref (pkg);
else if (strcmp (dnf_package_get_name (pkg), "setup") == 0)
setup_package = g_object_ref (pkg);
} }
{ DECLARE_RPMSIGHANDLER_RESET; { DECLARE_RPMSIGHANDLER_RESET;
@ -3079,6 +3085,7 @@ rpmostree_context_assemble (RpmOstreeContext *self,
tmprootfs_dfd, ".", self->devino_cache, tmprootfs_dfd, ".", self->devino_cache,
g_hash_table_lookup (pkg_to_ostree_commit, g_hash_table_lookup (pkg_to_ostree_commit,
filesystem_package), filesystem_package),
OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL,
cancellable, error)) cancellable, error))
return FALSE; return FALSE;
} }
@ -3117,9 +3124,17 @@ rpmostree_context_assemble (RpmOstreeContext *self,
if (pkg == filesystem_package) if (pkg == filesystem_package)
continue; continue;
/* The "setup" package currently contains /etc/passwd; in the treecompose
* case we need to inject that beforehand, so use "add files" just for
* that.
*/
OstreeRepoCheckoutOverwriteMode ovwmode =
(pkg == setup_package) ? OSTREE_REPO_CHECKOUT_OVERWRITE_ADD_FILES :
OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL;
if (!checkout_package_into_root (self, pkg, tmprootfs_dfd, ".", self->devino_cache, if (!checkout_package_into_root (self, pkg, tmprootfs_dfd, ".", self->devino_cache,
g_hash_table_lookup (pkg_to_ostree_commit, pkg), g_hash_table_lookup (pkg_to_ostree_commit, pkg),
cancellable, error)) ovwmode, cancellable, error))
return FALSE; return FALSE;
} }