diff options
| author | Matthew Heon <mheon@redhat.com> | 2019-03-08 18:16:39 -0500 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2019-03-08 18:22:10 -0500 |
| commit | caa8c66a874cda7ae76280258d4433961b9a7497 (patch) | |
| tree | 85d3d749dd72a8e6075bd8ad00a952e1a72489be | |
| parent | bf21ec8520bb429e9b1514422d9bc0b3426f4391 (diff) | |
| download | podman-caa8c66a874cda7ae76280258d4433961b9a7497.tar.gz podman-caa8c66a874cda7ae76280258d4433961b9a7497.tar.bz2 podman-caa8c66a874cda7ae76280258d4433961b9a7497.zip | |
We don't use crio-umount.conf
It also causes conflicts with CRI-O packages.
Also, change the path on seccomp.json so it lives in /usr/share
by default, with everything else.
Fixes #2596
Signed-off-by: Matthew Heon <mheon@redhat.com>
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | crio-umount.conf | 8 |
2 files changed, 2 insertions, 13 deletions
@@ -16,7 +16,6 @@ LIBEXECDIR ?= ${PREFIX}/libexec MANDIR ?= ${PREFIX}/share/man SHAREDIR_CONTAINERS ?= ${PREFIX}/share/containers ETCDIR ?= ${DESTDIR}/etc -ETCDIR_LIBPOD ?= ${ETCDIR}/crio TMPFILESDIR ?= ${PREFIX}/lib/tmpfiles.d SYSTEMDDIR ?= ${PREFIX}/lib/systemd/system BUILDTAGS ?= seccomp $(shell hack/btrfs_tag.sh) $(shell hack/btrfs_installed_tag.sh) $(shell hack/ostree_tag.sh) $(shell hack/selinux_tag.sh) $(shell hack/apparmor_tag.sh) varlink exclude_graphdriver_devicemapper @@ -28,7 +27,6 @@ CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker) OCI_RUNTIME ?= "" BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions -OCIUMOUNTINSTALLDIR=$(PREFIX)/share/oci-umount/oci-umount.d SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo -Z) PACKAGES ?= $(shell $(GO) list -tags "${BUILDTAGS}" ./... | grep -v github.com/containers/libpod/vendor | grep -v e2e | grep -v system ) @@ -242,10 +240,9 @@ install.man: docs install ${SELINUXOPT} -m 644 docs/links/*1 -t $(MANDIR)/man1 install.config: - install ${SELINUXOPT} -d -m 755 $(SHAREDIR_CONTAINERS) $(ETCDIR_LIBPOD) $(OCIUMOUNTINSTALLDIR) + install ${SELINUXOPT} -d -m 755 $(SHAREDIR_CONTAINERS) install ${SELINUXOPT} -m 644 libpod.conf $(SHAREDIR_CONTAINERS)/libpod.conf - install ${SELINUXOPT} -m 644 seccomp.json $(ETCDIR_LIBPOD)/seccomp.json - install ${SELINUXOPT} -m 644 crio-umount.conf $(OCIUMOUNTINSTALLDIR)/crio-umount.conf + install ${SELINUXOPT} -m 644 seccomp.json $(SHAREDIR_CONTAINERS)/seccomp.json install.completions: install ${SELINUXOPT} -d -m 755 ${BASHINSTALLDIR} diff --git a/crio-umount.conf b/crio-umount.conf deleted file mode 100644 index 5177e6362..000000000 --- a/crio-umount.conf +++ /dev/null @@ -1,8 +0,0 @@ -# This contains a list of paths on host which will be unmounted inside -# container. (If they are mounted inside container). - -# If there is a "/*" at the end, that means only mounts underneath that -# mounts (submounts) will be unmounted but top level mount will remain -# in place. -/var/run/containers/* -/var/lib/containers/storage/* |