diff options
| author | Dan Williams <dcbw@redhat.com> | 2018-01-05 14:20:22 -0600 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-08 14:10:51 +0000 |
| commit | 69a415f03325ce0efdc233dc46f6af3a4f2a5c2c (patch) | |
| tree | fcbe686530cf11d993a32dda86f3364877c9b52d | |
| parent | e2675ef921e6acb0131ddb5d81fe2d022ba8e022 (diff) | |
| download | podman-69a415f03325ce0efdc233dc46f6af3a4f2a5c2c.tar.gz podman-69a415f03325ce0efdc233dc46f6af3a4f2a5c2c.tar.bz2 podman-69a415f03325ce0efdc233dc46f6af3a4f2a5c2c.zip | |
cni: 98-podman-loopback.conf is not needed
ocicni internally handles the loopback so this file is not required.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Closes: #193
Approved by: mheon
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | cni/98-podman-loopback.conf | 4 |
2 files changed, 1 insertions, 6 deletions
@@ -154,8 +154,7 @@ install.completions: 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 + install ${SELINUXOPT} -D -m 644 cni/97-podman-bridge.conf ${ETCDIR}/cni/net.d/97-podman-bridge.conf uninstall: rm -f $(LIBEXECDIR)/crio/conmon diff --git a/cni/98-podman-loopback.conf b/cni/98-podman-loopback.conf deleted file mode 100644 index dd6630a85..000000000 --- a/cni/98-podman-loopback.conf +++ /dev/null @@ -1,4 +0,0 @@ -{ - "cniVersion": "0.2.0", - "type": "loopback" -} |