From 69a415f03325ce0efdc233dc46f6af3a4f2a5c2c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 5 Jan 2018 14:20:22 -0600 Subject: cni: 98-podman-loopback.conf is not needed ocicni internally handles the loopback so this file is not required. Signed-off-by: Dan Williams Closes: #193 Approved by: mheon --- Makefile | 3 +-- cni/98-podman-loopback.conf | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 cni/98-podman-loopback.conf diff --git a/Makefile b/Makefile index 0322ecf8d..8aae3024c 100644 --- a/Makefile +++ b/Makefile @@ -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" -} -- cgit v1.2.3-54-g00ecf