data: Remove all /var/tmp/flatpak-cache-* directories on boot

No one is clearing those directories so they pile up and can take a significant amount of disk space. Resolves: flatpak/flatpak#1119 Signed-off-by: Alberto Garcia <[email protected]> (cherry picked from commit 14d735b)
flatpak · Nov 14, 2023 · 3ac2d52 · 3ac2d52
1 parent 1352613
commit 3ac2d52
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -33,6 +33,7 @@ service_in_files = $(NULL)
 dbus_service_DATA = $(NULL)
 systemdsystemunit_DATA = $(NULL)
 systemduserunit_DATA = $(NULL)
+dist_tmpfiles_DATA = $(NULL)
 CLEANFILES += $(dbus_service_DATA)
 CLEANFILES += $(systemduserunit_DATA)
 EXTRA_DIST += $(service_in_files)

diff --git a/configure.ac b/configure.ac
@@ -422,6 +422,13 @@ AC_ARG_WITH([sysusersdir],
     [with_sysusersdir='${prefix}/lib/sysusers.d'])
 AC_SUBST([sysusersdir], [$with_sysusersdir])
 
+AC_ARG_WITH([tmpfilesdir],
+            [AS_HELP_STRING([--with-tmpfilesdir=DIR],
+                            [Directory for systemd tmpfiles.d configuration files (default=PREFIX/lib/tmpfiles.d)])],
+    [],
+    [with_tmpfilesdir='${prefix}/lib/tmpfiles.d'])
+AC_SUBST([tmpfilesdir], [$with_tmpfilesdir])
+
 AC_ARG_WITH(system-helper-user,
            [AS_HELP_STRING([--with-system-helper-user=USERNAME],
                            [Name of the system helper user])],

diff --git a/data/Makefile.am.inc b/data/Makefile.am.inc
@@ -5,6 +5,8 @@ introspection_DATA = \
 	data/org.freedesktop.portal.Flatpak.xml \
 	$(NULL)
 
+dist_tmpfiles_DATA += data/tmpfiles.d/flatpak.conf
+
 EXTRA_DIST += \
 	data/org.freedesktop.portal.Documents.xml \
 	data/org.freedesktop.impl.portal.PermissionStore.xml \

diff --git a/data/tmpfiles.d/flatpak.conf b/data/tmpfiles.d/flatpak.conf
@@ -0,0 +1,2 @@
+# This is a systemd tmpfiles.d configuration file
+R! /var/tmp/flatpak-cache-*
diff --git a/sideload-repos-systemd/Makefile.am.inc b/sideload-repos-systemd/Makefile.am.inc
@@ -11,8 +11,7 @@ systemduserunit_DATA += sideload-repos-systemd/flatpak-sideload-usb-repo.path
 %.path: %.path.in config.log
 	$(AM_V_GEN) $(SED) -e "s|\@media_dir\@|$(RUN_MEDIA_DIR)|" $< > $@
 
-tmpfilesdir = $(prefix)/lib/tmpfiles.d
-dist_tmpfiles_DATA = sideload-repos-systemd/tmpfiles.d/flatpak-sideload-repos.conf
+dist_tmpfiles_DATA += sideload-repos-systemd/tmpfiles.d/flatpak-sideload-repos.conf
 
 endif
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# This is a systemd tmpfiles.d configuration file
		R! /var/tmp/flatpak-cache-*