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

tmpfiles.d: rename and re-order

Browse Source 
According to tmpfiles.d(5), files should follow the convention
<package>.conf or <package>-<part>.conf. So we rename
tmpfiles-ostree-integration.conf to rpm-ostree-0-integration.conf.

The 0 index is so that the autovar conf created by postprocess is
sourced *after* this one, so that `integration.conf` has higher
precedence if there are duplicate entries.

Closes: #325
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2016-06-15 16:30:11 -04:00 committed by Atomic Bot
parent ea83aced3a
commit 3073a42868
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-rpm-ostree.am
View File

@ -57,7 +57,7 @@ rpm_ostree_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/app -I$(srcdir)/src/lib -I$(src
rpm_ostree_LDADD = $(AM_LDFLAGS) $(PKGDEP_RPMOSTREE_LIBS) librpmostreepriv.la librpmostree-1.la rpm_ostree_LDADD = $(AM_LDFLAGS) $(PKGDEP_RPMOSTREE_LIBS) librpmostreepriv.la librpmostree-1.la
privdatadir=$(pkglibdir) privdatadir=$(pkglibdir)
privdata_DATA = src/app/tmpfiles-ostree-integration.conf privdata_DATA = src/app/rpm-ostree-0-integration.conf
if BUILDOPT_USRBINATOMIC if BUILDOPT_USRBINATOMIC
INSTALL_DATA_HOOKS += install-usrbinatomic-hook INSTALL_DATA_HOOKS += install-usrbinatomic-hook

0
src/app/tmpfiles-ostree-integration.conf → src/app/rpm-ostree-0-integration.conf
View File

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

@ -616,7 +616,7 @@ convert_var_to_tmpfiles_d (int src_rootfs_dfd,
glnx_fd_close int tmpfiles_fd = -1; glnx_fd_close int tmpfiles_fd = -1;
/* Append to an existing one for package layering */ /* Append to an existing one for package layering */
if ((tmpfiles_fd = TEMP_FAILURE_RETRY (openat (dest_rootfs_dfd, "usr/lib/tmpfiles.d/rpm-ostree-autovar.conf", if ((tmpfiles_fd = TEMP_FAILURE_RETRY (openat (dest_rootfs_dfd, "usr/lib/tmpfiles.d/rpm-ostree-1-autovar.conf",
O_WRONLY | O_CREAT | O_APPEND | O_NOCTTY, 0644))) == -1) O_WRONLY | O_CREAT | O_APPEND | O_NOCTTY, 0644))) == -1)
{ {
glnx_set_error_from_errno (error); glnx_set_error_from_errno (error);
@ -962,7 +962,7 @@ create_rootfs_from_yumroot_content (GFile *targetroot,
} }
} }
g_print ("Adding tmpfiles-ostree-integration.conf\n"); g_print ("Adding rpm-ostree-0-integration.conf\n");
{ {
/* This is useful if we're running in an uninstalled configuration, e.g. /* This is useful if we're running in an uninstalled configuration, e.g.
* during tests. */ * during tests. */
@ -971,9 +971,9 @@ create_rootfs_from_yumroot_content (GFile *targetroot,
gs_unref_object GFile *src_pkglibdir = g_file_new_for_path (pkglibdir_path); gs_unref_object GFile *src_pkglibdir = g_file_new_for_path (pkglibdir_path);
gs_unref_object GFile *src_tmpfilesd = gs_unref_object GFile *src_tmpfilesd =
g_file_get_child (src_pkglibdir, "tmpfiles-ostree-integration.conf"); g_file_get_child (src_pkglibdir, "rpm-ostree-0-integration.conf");
gs_unref_object GFile *target_tmpfilesd = gs_unref_object GFile *target_tmpfilesd =
g_file_resolve_relative_path (targetroot, "usr/lib/tmpfiles.d/tmpfiles-ostree-integration.conf"); g_file_resolve_relative_path (targetroot, "usr/lib/tmpfiles.d/rpm-ostree-0-integration.conf");
gs_unref_object GFile *target_tmpfilesd_parent = g_file_get_parent (target_tmpfilesd); gs_unref_object GFile *target_tmpfilesd_parent = g_file_get_parent (target_tmpfilesd);
if (!gs_file_ensure_directory (target_tmpfilesd_parent, TRUE, cancellable, error)) if (!gs_file_ensure_directory (target_tmpfilesd_parent, TRUE, cancellable, error))

2
tests/check/test-compose.sh
View File

@ -26,7 +26,7 @@ check_root_test
# Let's create a temporary pkglibdir and tell rpm-ostree to use that dir # Let's create a temporary pkglibdir and tell rpm-ostree to use that dir
# instead of the (non-existent) installed version # instead of the (non-existent) installed version
mkdir pkglibdir mkdir pkglibdir
ln -s ${topsrcdir}/src/app/tmpfiles-ostree-integration.conf pkglibdir/ ln -s ${topsrcdir}/src/app/rpm-ostree-0-integration.conf pkglibdir/
export RPMOSTREE_UNINSTALLED_PKGLIBDIR=$PWD/pkglibdir export RPMOSTREE_UNINSTALLED_PKGLIBDIR=$PWD/pkglibdir
composedir=${commondir}/compose composedir=${commondir}/compose