Re: [PATCH v4 19/20] host/rootfs: weston: Run in cgroup

[Alyssa Ross <hi@alyssa.is>]

[-- Attachment #1: Type: text/plain, Size: 2241 bytes --]

Demi Marie Obenour <demiobenour@gmail.com> writes:

> Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
> ---
>  host/rootfs/file-list.mk                  | 1 +
>  host/rootfs/image/etc/s6-rc/weston/finish | 5 +++++
>  host/rootfs/image/etc/s6-rc/weston/run    | 9 +++++++--
>  3 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/host/rootfs/file-list.mk b/host/rootfs/file-list.mk
> index 065571ef3a5c61fa79a1d2ed878052a5f391be96..e890e6c211ff011e494cbdd64a1c26ff6360d94a 100644
> --- a/host/rootfs/file-list.mk
> +++ b/host/rootfs/file-list.mk
> @@ -119,6 +119,7 @@ S6_RC_FILES = \
>  	image/etc/s6-rc/vmm-env/contents.d/systemd-udevd-coldplug \
>  	image/etc/s6-rc/vmm-env/type \
>  	image/etc/s6-rc/weston/dependencies.d/systemd-udevd-coldplug \
> +	image/etc/s6-rc/weston/finish \
>  	image/etc/s6-rc/weston/notification-fd \
>  	image/etc/s6-rc/weston/run \
>  	image/etc/s6-rc/weston/type
> diff --git a/host/rootfs/image/etc/s6-rc/weston/finish b/host/rootfs/image/etc/s6-rc/weston/finish
> new file mode 100755
> index 0000000000000000000000000000000000000000..4d5b454e97c3584d0644c2d738514f13b1c53957
> --- /dev/null
> +++ b/host/rootfs/image/etc/s6-rc/weston/finish
> @@ -0,0 +1,5 @@
> +#!/usr/bin/execlineb -WS3
> +# SPDX-License-Identifier: EUPL-1.2+
> +# SPDX-FileCopyrightText: 2026 Demi Marie Obenour <demiobenour@gmail.com>
> +
> +cgroup-s6-finish $@
> diff --git a/host/rootfs/image/etc/s6-rc/weston/run b/host/rootfs/image/etc/s6-rc/weston/run
> old mode 100644
> new mode 100755
> index 8b065ee9a535d0a08e9255900c73b88a0c376d4b..a306d9903da6da920efa55eccdfb4f3d14698a79
> --- a/host/rootfs/image/etc/s6-rc/weston/run
> +++ b/host/rootfs/image/etc/s6-rc/weston/run
> @@ -1,8 +1,13 @@
> -#!/bin/execlineb -WP
> +#!/bin/execlineb -Wp
>  # SPDX-License-Identifier: EUPL-1.2+
>  # SPDX-FileCopyrightText: 2021, 2025 Alyssa Ross <hi@alyssa.is>
>  
> -importas -Siu WAYLAND_DISPLAY
> +multisubstitute {
> +  importas -Siu WAYLAND_DISPLAY
> +  importas -Si 1
> +}
> +
> +cgroup-setup --leaf --no-wait -- $1
>  
>  piperw 4 3
>  background {
>

It would also have been fine to just write "weston" here. ;)
(But if you prefer this way I don't mind.)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]