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

postprocess: Also move RPM database if not done already

Browse Source 
Prep for split compose.  The current Docker/OCI base images we
built at least for Fedora don't have this move done, so let's
ensure our postprocessing does it.

Closes: #1070
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-10-21 10:00:37 -04:00 committed by Atomic Bot
parent 21167bea72
commit aaf0d978b8
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1157,8 +1157,12 @@ cleanup_selinux_lockfiles (int rootfs_fd,
* from RPM conventions to OSTree conventions. For example:
*
* - Move /etc to /usr/etc
* - Move /var/lib/rpm to /usr/share/rpm
* - Clean up RPM db leftovers
* - Clean /usr/etc/passwd- backup files and such
*
* This function is idempotent; it may be called multiple times with
* no further effect after the first.
*/
gboolean
rpmostree_rootfs_postprocess_common (int rootfs_fd,
@ -1168,6 +1172,22 @@ rpmostree_rootfs_postprocess_common (int rootfs_fd,
if (!rename_if_exists (rootfs_fd, "etc", rootfs_fd, "usr/etc", error))
return FALSE;
if (!glnx_fstatat_allow_noent (rootfs_fd, RPMOSTREE_RPMDB_LOCATION, NULL, AT_SYMLINK_NOFOLLOW, error))
return FALSE;
if (errno == ENOENT)
{
struct stat stbuf;
if (!glnx_fstatat_allow_noent (rootfs_fd, "var/lib/rpm", &stbuf, AT_SYMLINK_NOFOLLOW, error))
return FALSE;
if (errno == 0 && S_ISDIR(stbuf.st_mode))
{
if (!rename_if_exists (rootfs_fd, "var/lib/rpm", rootfs_fd, RPMOSTREE_RPMDB_LOCATION, error))
return FALSE;
if (symlinkat ("../../" RPMOSTREE_RPMDB_LOCATION, rootfs_fd, "var/lib/rpm") < 0)
return glnx_throw_errno_prefix (error, "symlinkat(%s)", "var/lib/rpm");
}
}
if (!cleanup_leftover_files (rootfs_fd, RPMOSTREE_RPMDB_LOCATION, rpmdb_leftover_files,
rpmdb_leftover_prefixes, cancellable, error))
return FALSE;