app: Split out /var/{opt,usrlocal} tmpfiles.d entries in separate dropin

Prep for not always wanting those entries.
coreos · Jan 9, 2024 · bf01690 · bf01690
1 parent 253d361
commit bf01690
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am
@@ -85,7 +85,7 @@ librpmostreeinternals_la_CXXFLAGS = $(AM_CXXFLAGS) $(sanitizer_flags) $(rpmostre
 librpmostreeinternals_la_LIBADD = $(rpmostree_common_libs)
 
 privdatadir=$(pkglibdir)
-privdata_DATA = src/app/rpm-ostree-0-integration.conf
+privdata_DATA = src/app/rpm-ostree-0-integration.conf src/app/rpm-ostree-0-integration-opt-usrlocal.conf
 
 # Propagate automake verbose mode
 cargo_build = $(cargo) build $(if $(subst 0,,$(V)),--verbose,)

diff --git a/src/app/rpm-ostree-0-integration-opt-usrlocal.conf b/src/app/rpm-ostree-0-integration-opt-usrlocal.conf
@@ -0,0 +1,2 @@
+d /var/opt 0755 root root -
+d /var/usrlocal 0755 root root -
diff --git a/src/app/rpm-ostree-0-integration.conf b/src/app/rpm-ostree-0-integration.conf
@@ -1,8 +1,6 @@
 d /var/home 0755 root root -
-d /var/opt 0755 root root -
 d /var/srv 0755 root root -
 d /var/roothome 0700 root root -
-d /var/usrlocal 0755 root root -
 d /var/mnt 0755 root root -
 d /run/media 0755 root root -
 L /var/lib/rpm - - - - ../../usr/share/rpm

diff --git a/src/libpriv/rpmostree-postprocess.cxx b/src/libpriv/rpmostree-postprocess.cxx
@@ -461,6 +461,12 @@ postprocess_final (int rootfs_dfd, rpmostreecxx::Treefile &treefile, gboolean un
                           cancellable, error))
     return FALSE;
 
+  if (!glnx_file_copy_at (pkglibdir_dfd, "rpm-ostree-0-integration-opt-usrlocal.conf", NULL, rootfs_dfd,
+                          "usr/lib/tmpfiles.d/rpm-ostree-0-integration-opt-usrlocal.conf",
+                          GLNX_FILE_COPY_NOXATTRS, /* Don't take selinux label */
+                          cancellable, error))
+    return FALSE;
+
   /* Handle kernel/initramfs if we're not doing a container */
   if (!container)
     {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		d /var/opt 0755 root root -
		d /var/usrlocal 0755 root root -