From 560cb626a1a8f7d4bfca5d30f262cc90fb5d4608 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 10 Apr 2026 20:39:06 +0900 Subject: hst: remove enablement json adapter The go116 behaviour of built-in new function makes this cleaner. Signed-off-by: Ophestra --- cmd/hakurei/command.go | 4 ++-- cmd/hakurei/print_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cmd') diff --git a/cmd/hakurei/command.go b/cmd/hakurei/command.go index 78090161..12bf027a 100644 --- a/cmd/hakurei/command.go +++ b/cmd/hakurei/command.go @@ -152,7 +152,7 @@ func buildCommand(ctx context.Context, msg message.Msg, early *earlyHardeningErr } } - var et hst.Enablement + var et hst.Enablements if flagWayland { et |= hst.EWayland } @@ -170,7 +170,7 @@ func buildCommand(ctx context.Context, msg message.Msg, early *earlyHardeningErr ID: flagID, Identity: flagIdentity, Groups: flagGroups, - Enablements: hst.NewEnablements(et), + Enablements: &et, Container: &hst.ContainerConfig{ Filesystem: []hst.FilesystemConfigJSON{ diff --git a/cmd/hakurei/print_test.go b/cmd/hakurei/print_test.go index e67580b4..f947fced 100644 --- a/cmd/hakurei/print_test.go +++ b/cmd/hakurei/print_test.go @@ -32,7 +32,7 @@ var ( PID: 0xbeef, ShimPID: 0xcafe, Config: &hst.Config{ - Enablements: hst.NewEnablements(hst.EWayland | hst.EPipeWire), + Enablements: new(hst.EWayland | hst.EPipeWire), Identity: 1, Container: &hst.ContainerConfig{ Shell: check.MustAbs("/bin/sh"), -- cgit v1.3.1