diff options
| author | baude <bbaude@redhat.com> | 2017-12-20 15:13:52 -0600 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-12-22 19:23:36 +0000 |
| commit | 7f531263e6e41195278f205ad01274487cc1c1e0 (patch) | |
| tree | 1e162ee89a8302e16e743ec8d884f62d193ef2ef /Makefile | |
| parent | b08ac1065ca0201cd66cf53bf6fc75470a70f398 (diff) | |
| download | podman-7f531263e6e41195278f205ad01274487cc1c1e0.tar.gz podman-7f531263e6e41195278f205ad01274487cc1c1e0.tar.bz2 podman-7f531263e6e41195278f205ad01274487cc1c1e0.zip | |
Add default CNI configuration
podman needs a pair of configuration files to set up its default
network configuration: a bridge and loopback file.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #161
Approved by: baude
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -10,7 +10,7 @@ PREFIX ?= ${DESTDIR}/usr/local BINDIR ?= ${PREFIX}/bin LIBEXECDIR ?= ${PREFIX}/libexec MANDIR ?= ${PREFIX}/share/man -ETCDIR ?= ${DESTDIR}/etc +ETCDIR ?= /etc ETCDIR_LIBPOD ?= ${ETCDIR}/crio BUILDTAGS ?= seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) $(shell hack/btrfs_installed_tag.sh) $(shell hack/ostree_tag.sh) $(shell hack/selinux_tag.sh) @@ -135,7 +135,7 @@ docs/%.1: docs/%.1.md .gopathok docs: $(MANPAGES) -install: .gopathok install.bin install.man +install: .gopathok install.bin install.man install.cni install.bin: install ${SELINUXOPT} -D -m 755 bin/podman $(BINDIR)/podman @@ -153,6 +153,10 @@ install.completions: install ${SELINUXOPT} -d -m 755 ${BASHINSTALLDIR} install ${SELINUXOPT} -m 644 -D completions/bash/podman ${BASHINSTALLDIR} +install.cni: + install ${SELINUXOPT} -D -m 644 cni/98-podman-loopback.conf ${ETCDIR}/cni/net.d/98-podman-loopback.conf + install ${SELINUXOPT} -m 644 cni/97-podman-bridge.conf ${ETCDIR}/cni/net.d/97-podman-bridge.conf + uninstall: rm -f $(LIBEXECDIR)/crio/conmon for i in $(filter %.1,$(MANPAGES)); do \ |