diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-06 15:43:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 15:43:33 +0000 |
| commit | dc58d4e2858bf6688a775277adf8f775afc30e73 (patch) | |
| tree | e41b1e3299a8d759546b56ffd5f5c6aadf1a6ac9 | |
| parent | 47a1c9652657ba963be2f8fb1760f75dc33e2301 (diff) | |
| parent | 3daef2e82638a7bdae5037d4fc0d8918a57368e3 (diff) | |
| download | podman-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
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 1 | ||||
| -rw-r--r-- | contrib/tmpfile/podman.conf | 4 | ||||
| -rw-r--r-- | contrib/varlink/podman.conf | 1 | ||||
| -rw-r--r-- | pkg/util/utils_supported.go | 2 |
5 files changed, 9 insertions, 4 deletions
@@ -493,6 +493,8 @@ install.bin-nobuild: install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) install ${SELINUXOPT} -m 755 bin/podman $(DESTDIR)$(BINDIR)/podman test -z "${SELINUXOPT}" || chcon --verbose --reference=$(DESTDIR)$(BINDIR)/podman bin/podman + install ${SELINUXOPT} -m 755 -d ${DESTDIR}${TMPFILESDIR} + install ${SELINUXOPT} -m 644 contrib/tmpfile/podman.conf ${DESTDIR}${TMPFILESDIR}/podman.conf .PHONY: install.bin install.bin: podman install.bin-nobuild @@ -531,14 +533,13 @@ install.docker: docker-docs .PHONY: install.varlink ifneq (,$(findstring varlink,$(BUILDTAGS))) install.varlink: - install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR} + install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} install ${SELINUXOPT} -m 644 contrib/varlink/io.podman.socket ${DESTDIR}${SYSTEMDDIR}/io.podman.socket install ${SELINUXOPT} -m 644 contrib/varlink/io.podman.socket ${DESTDIR}${USERSYSTEMDDIR}/io.podman.socket install ${SELINUXOPT} -m 644 contrib/varlink/io.podman.service ${DESTDIR}${SYSTEMDDIR}/io.podman.service # User units are ordered differently, we can't make the *system* multi-user.target depend on a user unit. # For user units the default.target that's the default is fine. sed -e 's,^WantedBy=.*,WantedBy=default.target,' < contrib/varlink/io.podman.service > ${DESTDIR}${USERSYSTEMDDIR}/io.podman.service - install ${SELINUXOPT} -m 644 contrib/varlink/podman.conf ${DESTDIR}${TMPFILESDIR}/podman.conf else install.varlink: endif 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 diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go index e08fd6dda..2d636a7cb 100644 --- a/pkg/util/utils_supported.go +++ b/pkg/util/utils_supported.go @@ -38,7 +38,7 @@ func GetRuntimeDir() (string, error) { } } if runtimeDir == "" { - tmpDir := filepath.Join(os.TempDir(), fmt.Sprintf("run-%s", uid)) + tmpDir := filepath.Join(os.TempDir(), fmt.Sprintf("podman-run-%s", uid)) if err := os.MkdirAll(tmpDir, 0700); err != nil { logrus.Debug(err) } |