Re: [PATCH v4 5/5] host/rootfs: add run-flatpak script

[Alyssa Ross <hi@alyssa.is>]

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

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

> On 11/30/25 23:45, Alyssa Ross wrote:
>> This is the entrypoint for running Flatpak applications.
>> 
>> It would be good to only add mounts for the VM in virtiofsd's mount
>> namespace, so we don't need to do lots of manual unmounts, but that's
>> a wider change affecting more than just Flatpak.
>> 
>> I've tested this by copying my host's Flatpak repository into a disk
>> image, and attaching that as a drive to the VM.
>> 
>> Signed-off-by: Alyssa Ross <hi@alyssa.is>
>> ---
>> v4: use the new VM mount namespace
>> v3: https://spectrum-os.org/lists/archives/spectrum-devel/20251127202311.42422-7-hi@alyssa.is/
>> 
>>  host/rootfs/default.nix               | 12 +++----
>>  host/rootfs/file-list.mk              |  1 +
>>  host/rootfs/image/usr/bin/run-flatpak | 47 +++++++++++++++++++++++++++
>>  3 files changed, 54 insertions(+), 6 deletions(-)
>>  create mode 100755 host/rootfs/image/usr/bin/run-flatpak
>> 
>> diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix
>> index 57dd7a9..ca2084f 100644
>> --- a/host/rootfs/default.nix
>> +++ b/host/rootfs/default.nix
>> @@ -12,9 +12,9 @@ pkgsMusl.callPackage (
>>  , lib, stdenvNoCC, nixos, runCommand, writeClosure, erofs-utils, s6-rc
>>  , btrfs-progs, busybox, cloud-hypervisor, cosmic-files, crosvm
>>  , cryptsetup, dejavu_fonts, dbus, execline, foot, fuse3, iproute2
>> -, inotify-tools, jq, kmod, mdevd, mesa, s6, s6-linux-init, socat
>> -, systemd, util-linuxMinimal, virtiofsd, westonLite
>> -, xdg-desktop-portal, xdg-desktop-portal-gtk
>> +, inotify-tools, jq, kmod, mdevd, mesa, mount-flatpak, s6
>> +, s6-linux-init, socat, systemd, util-linuxMinimal, virtiofsd
>> +, westonLite, xdg-desktop-portal, xdg-desktop-portal-gtk
>>  , xdg-desktop-portal-spectrum-host
>>  }:
>>  
>> @@ -26,9 +26,9 @@ let
>>  
>>    packages = [
>>      btrfs-progs cloud-hypervisor cosmic-files crosvm cryptsetup dbus
>> -    execline fuse3 inotify-tools iproute2 jq kmod mdevd s6 s6-linux-init
>> -    s6-rc socat spectrum-host-tools spectrum-router util-linuxMinimal virtiofsd
>> -    xdg-desktop-portal-spectrum-host
>> +    execline fuse3 inotify-tools iproute2 jq kmod mdevd mount-flatpak s6
>> +    s6-linux-init s6-rc socat spectrum-host-tools spectrum-router
>> +    util-linuxMinimal virtiofsd xdg-desktop-portal-spectrum-host
>>  
>>      (foot.override { allowPgo = false; })
>>  
>> diff --git a/host/rootfs/file-list.mk b/host/rootfs/file-list.mk
>> index bfe3940..df22bce 100644
>> --- a/host/rootfs/file-list.mk
>> +++ b/host/rootfs/file-list.mk
>> @@ -55,6 +55,7 @@ FILES = \
>>  	image/usr/bin/assign-devices \
>>  	image/usr/bin/create-vm-dependencies \
>>  	image/usr/bin/run-appimage \
>> +	image/usr/bin/run-flatpak \
>>  	image/usr/bin/run-vmm \
>>  	image/usr/bin/spectrum-update \
>>  	image/usr/bin/vm-console \
>> diff --git a/host/rootfs/image/usr/bin/run-flatpak b/host/rootfs/image/usr/bin/run-flatpak
>> new file mode 100755
>> index 0000000..d7914a7
>> --- /dev/null
>> +++ b/host/rootfs/image/usr/bin/run-flatpak
>> @@ -0,0 +1,47 @@
>> +#!/bin/execlineb -W
>> +# SPDX-License-Identifier: EUPL-1.2+
>> +# SPDX-FileCopyrightText: 2024-2025 Alyssa Ross <hi@alyssa.is>
>> +
>> +backtick -E dir { mktemp -d /run/vm/by-id/XXXXXX }
>> +backtick -E id { basename -- $dir }
>> +
>> +if {
>> +  elgetpositionals
>
> Serial substitution again!  Should not be an issue as $id and $dir
> should not contain ‘$’, but nicer to avoid.

Indeed.  That's why I left dir and id, as previously discussed.

https://spectrum-os.org/lists/archives/spectrum-devel/87cy57311s.fsf@alyssa.is/

> You can use ‘elgetpositionals’ with ‘multisubstitute’ instead.

Not trivial to avoid serial substitution that way, as I'd also have to
lose the dir substitution or redefine it, and diverge from run-appimage
along the way.

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