container/init: reduce verbose noise

This makes it possible to optionally omit the identifying verbose message, for when the Op implementation can provide a much more useful message in its case, using information not yet available to the String method.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 23 insertions, 23 deletions

diff --git a/container/init_test.go b/container/init_test.go
index cc04057a..7dd92c09 100644
--- a/container/init_test.go
+++ b/container/init_test.go
@@ -790,9 +790,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -844,9 +844,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -898,9 +898,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -953,9 +953,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -1009,9 +1009,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -1067,9 +1067,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -1126,9 +1126,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -1186,9 +1186,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -1247,9 +1247,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -1309,9 +1309,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -1372,9 +1372,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -1436,9 +1436,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -1501,9 +1501,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -1574,9 +1574,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -1680,9 +1680,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -1787,9 +1787,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),
@@ -1895,9 +1895,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0750)}, nil, nil),
@@ -2008,9 +2008,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0750)}, nil, nil),
@@ -2107,9 +2107,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0750)}, nil, nil),
@@ -2197,9 +2197,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0750)}, nil, nil),
@@ -2289,9 +2289,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0750)}, nil, nil),
@@ -2388,9 +2388,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0750)}, nil, nil),
@@ -2524,9 +2524,9 @@ func TestInitEntrypoint(t *testing.T) {
 				call("pivotRoot", stub.ExpectArgs{"/proc/self/fd", "host"}, nil, nil),
 				call("chdir", stub.ExpectArgs{"/"}, nil, nil),
 				/* begin apply */
-				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &BindMountOp{sourceFinal: MustAbs("/"), Source: MustAbs("/"), Target: MustAbs("/"), Flags: BindDevice}}}, nil, nil),
 				call("stat", stub.ExpectArgs{"/host"}, isDirFi(true), nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot", os.FileMode(0700)}, nil, nil),
+				call("verbosef", stub.ExpectArgs{"mounting %q flags %#x", []any{"/sysroot", uintptr(0x4001)}}, nil, nil),
 				call("bindMount", stub.ExpectArgs{"/host", "/sysroot", uintptr(0x4001), false}, nil, nil),
 				call("verbosef", stub.ExpectArgs{"%s %s", []any{"mounting", &MountProcOp{Target: MustAbs("/proc/")}}}, nil, nil),
 				call("mkdirAll", stub.ExpectArgs{"/sysroot/proc", os.FileMode(0755)}, nil, nil),