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

> Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
> ---
>  host/rootfs/image/usr/bin/run-flatpak | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/host/rootfs/image/usr/bin/run-flatpak b/host/rootfs/image/usr/bin/run-flatpak
> index fafbc82ff6966d8be9c8083a17618f1fb192bd07..cdd13fb52d97751f92864d34a5221367df6d6f0d 100755
> --- a/host/rootfs/image/usr/bin/run-flatpak
> +++ b/host/rootfs/image/usr/bin/run-flatpak
> @@ -87,9 +87,12 @@ if {
>    fdclose 4
>  
>    foreground { run-vmm $id }
> -}
>  
> -if { s6-instance-delete -- /run/service/vm-services $id }
> +  # Even if s6-instance-delete fails, cgroup-purge is enough
> +  # to ensure that the VMM and all per-VM services are killed.
> +  foreground { s6-instance-delete /run/service/vm-services $id }
> +  cgroup-purge /vm-services.slice/vm-${id}.slice
> +}
>  
>  if { umount -R /run/vm/by-id/${id}/ns }
>  rm -r -- $diskdir /run/vm/by-id/${id} /run/configs/${id}
>

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