diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-09-28 21:51:10 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-09-28 21:51:10 +0900 |
| commit | e55822c62f7287698a683e6e7e40aa9a992b5585 (patch) | |
| tree | 19f5e8e2614c86c9a79f8264b49a2b48e13fabee /container/initbind.go | |
| parent | 802e6afa34de7f6124157153b0bde4ac25d7b363 (diff) | |
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>
Diffstat (limited to 'container/initbind.go')
| -rw-r--r-- | container/initbind.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/container/initbind.go b/container/initbind.go index 41097fa9..ad8bfaf5 100644 --- a/container/initbind.go +++ b/container/initbind.go @@ -91,7 +91,12 @@ func (b *BindMountOp) apply(_ *setupState, k syscallDispatcher) error { flags |= syscall.MS_NODEV } - return k.bindMount(source, target, flags, b.sourceFinal == b.Target) + if b.sourceFinal.String() == b.Target.String() { + k.verbosef("mounting %q flags %#x", target, flags) + } else { + k.verbosef("mounting %q on %q flags %#x", source, target, flags) + } + return k.bindMount(source, target, flags) } func (b *BindMountOp) Is(op Op) bool { @@ -101,7 +106,7 @@ func (b *BindMountOp) Is(op Op) bool { b.Target.Is(vb.Target) && b.Flags == vb.Flags } -func (*BindMountOp) prefix() string { return "mounting" } +func (*BindMountOp) prefix() (string, bool) { return "mounting", false } func (b *BindMountOp) String() string { if b.Source == nil || b.Target == nil { return "<invalid>" |