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

> Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
> ---
>  host/rootfs/image/usr/bin/run-appimage | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/host/rootfs/image/usr/bin/run-appimage b/host/rootfs/image/usr/bin/run-appimage
> index 672ec22d4b815fb9c2940e13ae08ed4093baee4e..03020c89b02f295844f5ed814034ba66be741f4b 100755
> --- a/host/rootfs/image/usr/bin/run-appimage
> +++ b/host/rootfs/image/usr/bin/run-appimage
> @@ -89,7 +89,12 @@ fdclose 4
>  foreground { run-vmm $id }
>  fdclose 3
>  
> -if { s6-instance-delete /run/service/vm-services $id }
> +if {
> +  # 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>