Skip to content

Commit d2abe47

Browse files
committed
libct/configs: exclude Relabel from json [un]marshaling
When deprecating Relabel field, its json attributes were mistakenly removed, so now it is: - saved to JSON under "Relabel" (rather than "relabel"); - won't be ignored if empty. Let's fix it before it's too late. Fixes: 8b2b5e9 ("libct: remove relabeling dead code") Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
1 parent 5f3ac16 commit d2abe47

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

libcontainer/configs/mount_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type Mount struct {
4646
// Relabel field is ignored.
4747
//
4848
// Deprecated: do not use. This field will be removed in runc 1.7.
49-
Relabel string
49+
Relabel string `json:"-"`
5050

5151
// RecAttr represents mount properties to be applied recursively (AT_RECURSIVE), see mount_setattr(2).
5252
RecAttr *unix.MountAttr `json:"rec_attr,omitempty"`

0 commit comments

Comments
 (0)