From 95cc82a54278a73593096c8d125fd5dad50a2b66 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Fri, 7 Feb 2020 14:14:36 +0100 Subject: [PATCH 3/3] Use external CNI --- internal/pkg/runtime/engine/singularity/container_linux.go | 4 ++-- mlocal/frags/build_network.mk | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/internal/pkg/runtime/engine/singularity/container_linux.go b/internal/pkg/runtime/engine/singularity/container_linux.go index c03d052d3..4d69c5ddc 100644 --- a/internal/pkg/runtime/engine/singularity/container_linux.go +++ b/internal/pkg/runtime/engine/singularity/container_linux.go @@ -56,10 +56,10 @@ var imageDriver image.Driver var umountPoints []string // defaultCNIConfPath is the default directory to CNI network configuration files. -var defaultCNIConfPath = filepath.Join(buildcfg.SYSCONFDIR, "singularity", "network") +var defaultCNIConfPath = filepath.Join(buildcfg.SYSCONFDIR, "cni", "net.d") // defaultCNIPluginPath is the default directory to CNI plugins executables. -var defaultCNIPluginPath = filepath.Join(buildcfg.LIBEXECDIR, "singularity", "cni") +var defaultCNIPluginPath = filepath.Join(buildcfg.LIBEXECDIR, "lib", "cni") type lastMount struct { dest string diff --git a/mlocal/frags/build_network.mk b/mlocal/frags/build_network.mk index f774643d4..aa508ce17 100644 --- a/mlocal/frags/build_network.mk +++ b/mlocal/frags/build_network.mk @@ -13,7 +13,7 @@ cni_config_LIST := $(SOURCEDIR)/etc/network/00_bridge.conflist \ $(SOURCEDIR)/etc/network/20_ipvlan.conflist \ $(SOURCEDIR)/etc/network/30_macvlan.conflist \ $(SOURCEDIR)/etc/network/40_fakeroot.conflist -cni_config_INSTALL := $(DESTDIR)$(SYSCONFDIR)/singularity/network +cni_config_INSTALL := $(DESTDIR)$(SYSCONFDIR)/cni/net.d .PHONY: cniplugins cniplugins: @@ -39,5 +39,4 @@ $(cni_config_INSTALL): $(cni_config_LIST) $(V)install -m 0644 $? $@ CLEANFILES += $(cni_plugins_EXECUTABLES) -INSTALLFILES += $(cni_plugins_INSTALL) $(cni_config_INSTALL) -ALL += cniplugins +INSTALLFILES += $(cni_config_INSTALL) -- 2.27.0