diff --git a/internal/app/internal/setuid/seal.go b/internal/app/internal/setuid/seal.go index 51ff16a..69b242a 100644 --- a/internal/app/internal/setuid/seal.go +++ b/internal/app/internal/setuid/seal.go @@ -393,7 +393,7 @@ func (seal *outcome) finalise(ctx context.Context, sys sys.State, config *hst.Co appID := config.ID if appID == "" { // use instance ID in case app id is not set - appID = "uk.gensokyo.hakurei." + seal.id.String() + appID = "app.hakurei." + seal.id.String() } // downstream socket paths outerPath := path.Join(share.instance(), "wayland") diff --git a/print.go b/print.go index a8ede63..4227d46 100644 --- a/print.go +++ b/print.go @@ -264,7 +264,7 @@ func printPs(output io.Writer, now time.Time, s state.Store, short, flagJSON boo as = strconv.Itoa(e.Config.Identity) id := e.Config.ID if id == "" { - id = "uk.gensokyo.hakurei." + e.s[:8] + id = "app.hakurei." + e.s[:8] } as += " (" + id + ")" } diff --git a/print_test.go b/print_test.go index 0c10804..883199d 100644 --- a/print_test.go +++ b/print_test.go @@ -460,8 +460,8 @@ func Test_printPs(t *testing.T) { {"nil instance", state.Entries{testID: nil}, false, false, " Instance PID Application Uptime\n"}, {"state corruption", state.Entries{app.ID{}: testState}, false, false, " Instance PID Application Uptime\n"}, - {"valid pd", state.Entries{testID: &state.State{ID: testID, PID: 1 << 8, Config: new(hst.Config), Time: testAppTime}}, false, false, ` Instance PID Application Uptime - 8e2c76b0 256 0 (uk.gensokyo.hakurei.8e2c76b0) 1h2m32s + {"valid pd", state.Entries{testID: &state.State{ID: testID, PID: 1 << 8, Config: new(hst.Config), Time: testAppTime}}, false, false, ` Instance PID Application Uptime + 8e2c76b0 256 0 (app.hakurei.8e2c76b0) 1h2m32s `}, {"valid", state.Entries{testID: testState}, false, false, ` Instance PID Application Uptime diff --git a/sandbox/wl/wayland-bind.c b/sandbox/wl/wayland-bind.c index bf76653..989ab74 100644 --- a/sandbox/wl/wayland-bind.c +++ b/sandbox/wl/wayland-bind.c @@ -73,9 +73,7 @@ int32_t hakurei_bind_wayland_fd(char *socket_path, int fd, const char *app_id, struct wp_security_context_v1 *security_context; security_context = wp_security_context_manager_v1_create_listener( security_context_manager, listen_fd, sync_fd); - wp_security_context_v1_set_sandbox_engine(security_context, - "uk.gensokyo.hakurei"); - + wp_security_context_v1_set_sandbox_engine(security_context, "app.hakurei"); wp_security_context_v1_set_app_id(security_context, app_id); wp_security_context_v1_set_instance_id(security_context, instance_id); wp_security_context_v1_commit(security_context);