Merge pull request #980 from elezar/add-rprivate-to-mount-options

elezar · web-flow · commit 6dfd63f4a826 · 2025-05-16T07:53:39.000+02:00
Add rprivate to CDI mount options
diff --git a/cmd/nvidia-ctk-installer/toolkit/toolkit_test.go b/cmd/nvidia-ctk-installer/toolkit/toolkit_test.go
@@ -109,7 +109,8 @@ containerEdits:
             - ro
             - nosuid
             - nodev
-            - bind
+            - rbind
+            - rprivate
 `,
 		},
 	}
diff --git a/cmd/nvidia-ctk/cdi/generate/generate_test.go b/cmd/nvidia-ctk/cdi/generate/generate_test.go
@@ -111,7 +111,8 @@ containerEdits:
             - ro
             - nosuid
             - nodev
-            - bind
+            - rbind
+            - rprivate
 `,
 		},
 	}
diff --git a/internal/discover/ipc_test.go b/internal/discover/ipc_test.go
@@ -52,7 +52,8 @@ func TestIPCMounts(t *testing.T) {
 					"ro",
 					"nosuid",
 					"nodev",
-					"bind",
+					"rbind",
+					"rprivate",
 					"noexec",
 				},
 			},
diff --git a/internal/discover/mounts-to-container-path.go b/internal/discover/mounts-to-container-path.go
@@ -71,7 +71,8 @@ func (d *mountsToContainerPath) Mounts() ([]Mount, error) {
 				"ro",
 				"nosuid",
 				"nodev",
-				"bind",
+				"rbind",
+				"rprivate",
 			},
 		}
 		mounts = append(mounts, mount)
diff --git a/internal/discover/mounts-to-container-path_test.go b/internal/discover/mounts-to-container-path_test.go
@@ -32,7 +32,8 @@ func TestMountsToContainerPath(t *testing.T) {
 		"ro",
 		"nosuid",
 		"nodev",
-		"bind",
+		"rbind",
+		"rprivate",
 	}
 
 	testCases := []struct {
diff --git a/internal/discover/mounts.go b/internal/discover/mounts.go
@@ -90,7 +90,8 @@ func (d *mounts) Mounts() ([]Mount, error) {
 					"ro",
 					"nosuid",
 					"nodev",
-					"bind",
+					"rbind",
+					"rprivate",
 				},
 			}
 		}
diff --git a/internal/discover/mounts_test.go b/internal/discover/mounts_test.go
@@ -41,7 +41,8 @@ func TestMounts(t *testing.T) {
 		"ro",
 		"nosuid",
 		"nodev",
-		"bind",
+		"rbind",
+		"rprivate",
 	}
 
 	logger, logHook := testlog.NewNullLogger()
diff --git a/internal/platform-support/tegra/csv_test.go b/internal/platform-support/tegra/csv_test.go
@@ -79,12 +79,12 @@ func TestDiscovererFromCSVFiles(t *testing.T) {
 				{
 					Path:     "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
 					HostPath: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
-					Options:  []string{"ro", "nosuid", "nodev", "bind"},
+					Options:  []string{"ro", "nosuid", "nodev", "rbind", "rprivate"},
 				},
 				{
 					Path:     "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
 					HostPath: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
-					Options:  []string{"ro", "nosuid", "nodev", "bind"},
+					Options:  []string{"ro", "nosuid", "nodev", "rbind", "rprivate"},
 				},
 			},
 			expectedHooks: []discover.Hook{
@@ -135,12 +135,12 @@ func TestDiscovererFromCSVFiles(t *testing.T) {
 				{
 					Path:     "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
 					HostPath: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
-					Options:  []string{"ro", "nosuid", "nodev", "bind"},
+					Options:  []string{"ro", "nosuid", "nodev", "rbind", "rprivate"},
 				},
 				{
 					Path:     "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
 					HostPath: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
-					Options:  []string{"ro", "nosuid", "nodev", "bind"},
+					Options:  []string{"ro", "nosuid", "nodev", "rbind", "rprivate"},
 				},
 			},
 			expectedHooks: []discover.Hook{
@@ -175,7 +175,7 @@ func TestDiscovererFromCSVFiles(t *testing.T) {
 				{
 					Path:     "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
 					HostPath: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
-					Options:  []string{"ro", "nosuid", "nodev", "bind"},
+					Options:  []string{"ro", "nosuid", "nodev", "rbind", "rprivate"},
 				},
 			},
 		},

-Original file line number
+Diff line change
             - ro
             - nosuid
             - nodev
 -            - bind
 +            - rbind
 +            - rprivate
 `,
 		},
+	}
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ func TestMountsToContainerPath(t *testing.T) {`
`32`	`32`	`"ro",`
`33`	`33`	`"nosuid",`
`34`	`34`	`"nodev",`
`35`		`- "bind",`
	`35`	`+ "rbind",`
	`36`	`+ "rprivate",`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`testCases := []struct {`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ func (d *mounts) Mounts() ([]Mount, error) {`
`90`	`90`	`"ro",`
`91`	`91`	`"nosuid",`
`92`	`92`	`"nodev",`
`93`		`- "bind",`
	`93`	`+ "rbind",`
	`94`	`+ "rprivate",`
`94`	`95`	`},`
`95`	`96`	`}`
`96`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ func TestMounts(t *testing.T) {`
`41`	`41`	`"ro",`
`42`	`42`	`"nosuid",`
`43`	`43`	`"nodev",`
`44`		`- "bind",`
	`44`	`+ "rbind",`
	`45`	`+ "rprivate",`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`logger, logHook := testlog.NewNullLogger()`