summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-11-06 15:43:33 +0000
committerGitHub <noreply@github.com>2020-11-06 15:43:33 +0000
commitdc58d4e2858bf6688a775277adf8f775afc30e73 (patch)
treee41b1e3299a8d759546b56ffd5f5c6aadf1a6ac9 /contrib
parent47a1c9652657ba963be2f8fb1760f75dc33e2301 (diff)
parent3daef2e82638a7bdae5037d4fc0d8918a57368e3 (diff)
downloadpodman-dc58d4e2858bf6688a775277adf8f775afc30e73.tar.gz
podman-dc58d4e2858bf6688a775277adf8f775afc30e73.tar.bz2
podman-dc58d4e2858bf6688a775277adf8f775afc30e73.zip
Merge pull request #8241 from rhatdan/tmpfile
Use /tmp/podman-run-* for backup XDG_RUNTIME_DIR
Diffstat (limited to 'contrib')
-rw-r--r--contrib/spec/podman.spec.in1
-rw-r--r--contrib/tmpfile/podman.conf4
-rw-r--r--contrib/varlink/podman.conf1
3 files changed, 5 insertions, 1 deletions
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 2e266b59f..2a3041ccc 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -509,6 +509,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%{_usr}/lib/systemd/user/podman.socket
%{_usr}/lib/systemd/user/podman-auto-update.service
%{_usr}/lib/systemd/user/podman-auto-update.timer
+%{_usr}/lib/tmpfiles.d/podman.conf
%if 0%{?with_devel}
%files -n libpod-devel -f devel.file-list
diff --git a/contrib/tmpfile/podman.conf b/contrib/tmpfile/podman.conf
new file mode 100644
index 000000000..d769671e3
--- /dev/null
+++ b/contrib/tmpfile/podman.conf
@@ -0,0 +1,4 @@
+# /tmp/podman-run-* directory can contain content for Podman containers that have run
+# for many days. This following line prevents systemd from removing this content.
+x /tmp/podman-run-.*
+d /run/podman 0700 root root
diff --git a/contrib/varlink/podman.conf b/contrib/varlink/podman.conf
deleted file mode 100644
index 732c15185..000000000
--- a/contrib/varlink/podman.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/podman 0700 root root