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

passwd-util: Drop unnecessary OstreeRepo arg

Browse Source 
We don't actually need the repo in `rpmostree_passwd_compose_prep()`
since we're already passed the OstreeRepoFile root of the previous
commit as a separate arg.

Closes: #1658
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-11-02 13:26:27 -04:00 committed by Atomic Bot
parent 8adeb970e3
commit 82ceef78ce
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/rpmostree-compose-builtin-rojig.c
View File

@ -199,9 +199,8 @@ install_packages (RpmOstreeRojigCompose *self,
if (opt_download_only) if (opt_download_only)
return TRUE; /* 🔚 Early return */ return TRUE; /* 🔚 Early return */
if (!rpmostree_passwd_compose_prep (self->repo, self->rootfs_dfd, TRUE, if (!rpmostree_passwd_compose_prep (self->rootfs_dfd, TRUE, self->treefile_rs,
self->treefile_rs, self->treefile, self->treefile, NULL, cancellable, error))
NULL, cancellable, error))
return FALSE; return FALSE;
rpmostree_context_set_tmprootfs_dfd (self->corectx, self->rootfs_dfd); rpmostree_context_set_tmprootfs_dfd (self->corectx, self->rootfs_dfd);

5
src/app/rpmostree-compose-builtin-tree.c
View File

@ -331,9 +331,8 @@ install_packages (RpmOstreeTreeComposeContext *self,
} }
/* Before we install packages, inject /etc/{passwd,group} if configured. */ /* Before we install packages, inject /etc/{passwd,group} if configured. */
if (!rpmostree_passwd_compose_prep (self->repo, rootfs_dfd, opt_unified_core, if (!rpmostree_passwd_compose_prep (rootfs_dfd, opt_unified_core, self->treefile_rs,
self->treefile_rs, self->treefile, self->treefile, self->previous_root,
self->previous_root,
cancellable, error)) cancellable, error))
return FALSE; return FALSE;

3
src/libpriv/rpmostree-passwd-util.c
View File

@ -1068,8 +1068,7 @@ _data_from_json (int rootfs_dfd,
* down any files, and notably before running RPM `useradd` etc. * down any files, and notably before running RPM `useradd` etc.
*/ */
gboolean gboolean
rpmostree_passwd_compose_prep (OstreeRepo *repo, rpmostree_passwd_compose_prep (int rootfs_dfd,
int rootfs_dfd,
gboolean unified_core, gboolean unified_core,
RORTreefile *treefile_rs, RORTreefile *treefile_rs,
JsonObject *treedata, JsonObject *treedata,

3
src/libpriv/rpmostree-passwd-util.h
View File

@ -57,8 +57,7 @@ rpmostree_passwd_migrate_except_root (int rootfs_dfd,
GError **error); GError **error);
gboolean gboolean
rpmostree_passwd_compose_prep (OstreeRepo *repo, rpmostree_passwd_compose_prep (int rootfs_dfd,
int rootfs_dfd,
gboolean unified_core, gboolean unified_core,
RORTreefile *treefile_rs, RORTreefile *treefile_rs,
JsonObject *treedata, JsonObject *treedata,