aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-08-24 08:54:01 -0400
committerGitHub <noreply@github.com>2022-08-24 08:54:01 -0400
commit2195656d9ed9b5ae576e24ce377f52dae2a76fb0 (patch)
treec74b6044a6c0d871e4ba7ea7564f408562ee4ee7 /Makefile
parente4cbbe786258c594c264013aa7b550489d5a9e77 (diff)
parentc3dc92a50ae25e6da6ce08ac21d3d3bbf84a8a7f (diff)
downloadpodman-2195656d9ed9b5ae576e24ce377f52dae2a76fb0.tar.gz
podman-2195656d9ed9b5ae576e24ce377f52dae2a76fb0.tar.bz2
podman-2195656d9ed9b5ae576e24ce377f52dae2a76fb0.zip
Merge pull request #15444 from foriequal0/podman-docker-rootless
Rootless Docker API socket alias can be exposed with user mode systemd-tmpfiles
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4f222d6d4..4818ee122 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ MANDIR ?= ${PREFIX}/share/man
SHAREDIR_CONTAINERS ?= ${PREFIX}/share/containers
ETCDIR ?= ${PREFIX}/etc
TMPFILESDIR ?= ${PREFIX}/lib/tmpfiles.d
+USERTMPFILESDIR ?= ${PREFIX}/share/user-tmpfiles.d
MODULESLOADDIR ?= ${PREFIX}/lib/modules-load.d
SYSTEMDDIR ?= ${PREFIX}/lib/systemd/system
USERSYSTEMDDIR ?= ${PREFIX}/lib/systemd/user
@@ -795,8 +796,9 @@ install.completions:
install.docker:
install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR)
install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker
- install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}
+ install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR} ${DESTDIR}${USERTMPFILESDIR}
install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-docker.conf -t ${DESTDIR}${TMPFILESDIR}
+ install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-docker.conf -t ${DESTDIR}${USERTMPFILESDIR}
.PHONY: install.docker-docs
install.docker-docs: