1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
From: Dmitry Smirnov <onlyjob@debian.org>
Date: Thu, 6 Mar 2025 16:14:24 +0100
Subject: set path to CNI plugins as provided by "containernetworking-plugins"
package.
Last-Update: 2019-11-14
Forwarded: not-needed
---
internal/pkg/runtime/engine/apptainer/container_linux.go | 2 +-
internal/pkg/test/tool/require/require.go | 2 +-
pkg/network/network_linux_test.go | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/internal/pkg/runtime/engine/apptainer/container_linux.go b/internal/pkg/runtime/engine/apptainer/container_linux.go
index 5f8a8e6..d91fb0e 100644
--- a/internal/pkg/runtime/engine/apptainer/container_linux.go
+++ b/internal/pkg/runtime/engine/apptainer/container_linux.go
@@ -71,7 +71,7 @@ var (
var defaultCNIConfPath = filepath.Join(buildcfg.SYSCONFDIR, "apptainer", "network")
// defaultCNIPluginPath is the default directory to CNI plugins executables.
-var defaultCNIPluginPath = filepath.Join(buildcfg.LIBEXECDIR, "apptainer", "cni")
+var defaultCNIPluginPath = filepath.Join("/usr/lib/cni")
type lastMount struct {
dest string
diff --git a/internal/pkg/test/tool/require/require.go b/internal/pkg/test/tool/require/require.go
index 0426d6f..2ae5a13 100644
--- a/internal/pkg/test/tool/require/require.go
+++ b/internal/pkg/test/tool/require/require.go
@@ -99,7 +99,7 @@ func Network(t *testing.T) {
cniPath := new(network.CNIPath)
cniPath.Conf = filepath.Join(buildcfg.SYSCONFDIR, "apptainer", "network")
- cniPath.Plugin = filepath.Join(buildcfg.LIBEXECDIR, "apptainer", "cni")
+ cniPath.Plugin = filepath.Join("/usr/lib/cni")
setup, err := network.NewSetup([]string{"bridge"}, "_test_", nsPath, cniPath)
if err != nil {
diff --git a/pkg/network/network_linux_test.go b/pkg/network/network_linux_test.go
index e803fae..1279464 100644
--- a/pkg/network/network_linux_test.go
+++ b/pkg/network/network_linux_test.go
@@ -116,7 +116,7 @@ var confFiles = []struct {
var defaultCNIConfPath = ""
// defaultCNIPluginPath is the default directory to CNI plugins executables
-var defaultCNIPluginPath = filepath.Join(buildcfg.LIBEXECDIR, "apptainer", "cni")
+var defaultCNIPluginPath = filepath.Join("/usr/lib/cni")
// testNetworks will contains configured network
var testNetworks []string
|
