diff options
Diffstat (limited to 'internal/app')
| -rw-r--r-- | internal/app/app_nixos_linux_test.go | 2 | ||||
| -rw-r--r-- | internal/app/app_pd_linux_test.go | 2 | ||||
| -rw-r--r-- | internal/app/process_linux.go | 2 | ||||
| -rw-r--r-- | internal/app/seal_linux.go | 10 |
4 files changed, 8 insertions, 8 deletions
diff --git a/internal/app/app_nixos_linux_test.go b/internal/app/app_nixos_linux_test.go index ef587222..d762ca0c 100644 --- a/internal/app/app_nixos_linux_test.go +++ b/internal/app/app_nixos_linux_test.go @@ -23,7 +23,7 @@ var testCasesNixos = []sealTestCase{ &hst.Config{ ID: "org.chromium.Chromium", Path: m("/nix/store/yqivzpzzn7z5x0lq9hmbzygh45d8rhqd-chromium-start"), - Enablements: system.EWayland | system.EDBus | system.EPulse, + Enablements: hst.NewEnablements(system.EWayland | system.EDBus | system.EPulse), Shell: m("/run/current-system/sw/bin/zsh"), Container: &hst.ContainerConfig{ diff --git a/internal/app/app_pd_linux_test.go b/internal/app/app_pd_linux_test.go index cc738ed6..109e8816 100644 --- a/internal/app/app_pd_linux_test.go +++ b/internal/app/app_pd_linux_test.go @@ -106,7 +106,7 @@ var testCasesPd = []sealTestCase{ }, Filter: true, }, - Enablements: system.EWayland | system.EDBus | system.EPulse, + Enablements: hst.NewEnablements(system.EWayland | system.EDBus | system.EPulse), }, state.ID{ 0xeb, 0xf0, 0x83, 0xd1, diff --git a/internal/app/process_linux.go b/internal/app/process_linux.go index 11d4c8e9..c6df6feb 100644 --- a/internal/app/process_linux.go +++ b/internal/app/process_linux.go @@ -64,7 +64,7 @@ func (seal *outcome) Run(rs *RunState) error { // accumulate enablements of remaining launchers for i, s := range states { if s.Config != nil { - rt |= s.Config.Enablements + rt |= s.Config.Enablements.Unwrap() } else { log.Printf("state entry %d does not contain config", i) } diff --git a/internal/app/seal_linux.go b/internal/app/seal_linux.go index 961447b3..d0a8a546 100644 --- a/internal/app/seal_linux.go +++ b/internal/app/seal_linux.go @@ -247,7 +247,7 @@ func (seal *outcome) finalise(ctx context.Context, sys sys.State, config *hst.Co } // bind GPU stuff - if config.Enablements&(system.EX11|system.EWayland) != 0 { + if config.Enablements.Unwrap()&(system.EX11|system.EWayland) != 0 { conf.Filesystem = append(conf.Filesystem, hst.FilesystemConfigJSON{FilesystemConfig: &hst.FSBind{Src: container.AbsFHSDev.Append("dri"), Device: true, Optional: true}}) } // opportunistically bind kvm @@ -348,7 +348,7 @@ func (seal *outcome) finalise(ctx context.Context, sys sys.State, config *hst.Co seal.env[term] = t } - if config.Enablements&system.EWayland != 0 { + if config.Enablements.Unwrap()&system.EWayland != 0 { // outer wayland socket (usually `/run/user/%d/wayland-%d`) var socketPath *container.Absolute if name, ok := sys.LookupEnv(wayland.WaylandDisplay); !ok { @@ -381,7 +381,7 @@ func (seal *outcome) finalise(ctx context.Context, sys sys.State, config *hst.Co } } - if config.Enablements&system.EX11 != 0 { + if config.Enablements.Unwrap()&system.EX11 != 0 { if d, ok := sys.LookupEnv(display); !ok { return hlog.WrapErr(ErrXDisplay, "DISPLAY is not set") @@ -393,7 +393,7 @@ func (seal *outcome) finalise(ctx context.Context, sys sys.State, config *hst.Co } } - if config.Enablements&system.EPulse != 0 { + if config.Enablements.Unwrap()&system.EPulse != 0 { // PulseAudio runtime directory (usually `/run/user/%d/pulse`) pulseRuntimeDir := share.sc.RuntimePath.Append("pulse") // PulseAudio socket (usually `/run/user/%d/pulse/native`) @@ -442,7 +442,7 @@ func (seal *outcome) finalise(ctx context.Context, sys sys.State, config *hst.Co } } - if config.Enablements&system.EDBus != 0 { + if config.Enablements.Unwrap()&system.EDBus != 0 { // ensure dbus session bus defaults if config.SessionBus == nil { config.SessionBus = dbus.NewConfig(config.ID, true, true) |
