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

> Avoids concurrent execution and leaked child processes.

Those things shouldn't happen anyway, but I guess it's cheap to make
sure of it.  With cgroup-s6-finish changed to something that only does
cgroups:

Reviewed-by: Alysa Ross <hi@alyssa.is>

> Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
> ---
>  host/rootfs/file-list.mk                                             | 1 +
>  .../s6-linux-init/run-image/service/serial-getty-generator/finish    | 5 +++++
>  .../etc/s6-linux-init/run-image/service/serial-getty-generator/run   | 4 +++-
>  3 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/host/rootfs/file-list.mk b/host/rootfs/file-list.mk
> index c707c01179238231f70164ffda5b7c940b34192a..b899b4356d73d73ad0fc4ecd3837b7a3525d6f5a 100644
> --- a/host/rootfs/file-list.mk
> +++ b/host/rootfs/file-list.mk
> @@ -21,6 +21,7 @@ FILES = \
>  	image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/run \
>  	image/etc/s6-linux-init/run-image/service/s6-svscan-log/notification-fd \
>  	image/etc/s6-linux-init/run-image/service/s6-svscan-log/run \
> +	image/etc/s6-linux-init/run-image/service/serial-getty-generator/finish \
>  	image/etc/s6-linux-init/run-image/service/serial-getty-generator/run \
>  	image/etc/s6-linux-init/run-image/service/serial-getty/notification-fd \
>  	image/etc/s6-linux-init/run-image/service/serial-getty/run \
> diff --git a/host/rootfs/image/etc/s6-linux-init/run-image/service/serial-getty-generator/finish b/host/rootfs/image/etc/s6-linux-init/run-image/service/serial-getty-generator/finish
> new file mode 100755
> index 0000000000000000000000000000000000000000..4d5b454e97c3584d0644c2d738514f13b1c53957
> --- /dev/null
> +++ b/host/rootfs/image/etc/s6-linux-init/run-image/service/serial-getty-generator/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-linux-init/run-image/service/serial-getty-generator/run b/host/rootfs/image/etc/s6-linux-init/run-image/service/serial-getty-generator/run
> index bf66ab0878fc6d8e77ca71a4a89e50c139a6bb11..a1846a29cf55892127feb7ecfc0adcd12f0497bd 100755
> --- a/host/rootfs/image/etc/s6-linux-init/run-image/service/serial-getty-generator/run
> +++ b/host/rootfs/image/etc/s6-linux-init/run-image/service/serial-getty-generator/run
> @@ -1,7 +1,9 @@
> -#!/bin/execlineb -WP
> +#!/bin/execlineb -WS1
>  # SPDX-License-Identifier: EUPL-1.2+
>  # SPDX-FileCopyrightText: 2024-2025 Alyssa Ross <hi@alyssa.is>
>  
> +# avoid concurrent operation
> +cgroup-setup --leaf -- $1
>  piperw 3 4
>  background {
>    fdclose 3
>
> -- 
> 2.55.0