From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Subject: [PATCH 3/3] host/rootfs: add run-flatpak script
Date: Thu, 13 Nov 2025 13:04:52 +0100 [thread overview]
Message-ID: <20251113120452.65711-3-hi@alyssa.is> (raw)
In-Reply-To: <20251113120452.65711-1-hi@alyssa.is>
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.
Signed-off-by: Alyssa Ross <hi@alyssa.is>
---
host/rootfs/file-list.mk | 1 +
host/rootfs/image/usr/bin/run-flatpak | 56 +++++++++++++++++++++++++++
2 files changed, 57 insertions(+)
create mode 100755 host/rootfs/image/usr/bin/run-flatpak
diff --git a/host/rootfs/file-list.mk b/host/rootfs/file-list.mk
index 9acaa1d..a796b90 100644
--- a/host/rootfs/file-list.mk
+++ b/host/rootfs/file-list.mk
@@ -48,6 +48,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/vm-console \
image/usr/bin/vm-import \
diff --git a/host/rootfs/image/usr/bin/run-flatpak b/host/rootfs/image/usr/bin/run-flatpak
new file mode 100755
index 0000000..39ee17b
--- /dev/null
+++ b/host/rootfs/image/usr/bin/run-flatpak
@@ -0,0 +1,56 @@
+#!/bin/execlineb -S2
+# SPDX-License-Identifier: EUPL-1.2+
+# SPDX-FileCopyrightText: 2024 Alyssa Ross <hi@alyssa.is>
+
+backtick -E dir { mktemp -d /run/vm/by-id/XXXXXX }
+backtick -E id { basename -- $dir }
+
+if { mkdir -p /run/configs/${id}/fs }
+if { redirfd -w 1 /run/configs/${id}/fs/type echo flatpak }
+if { cd /run/configs/${id}/fs mount-flatpak $1 $2 }
+if {
+ ln -s /usr/lib/spectrum/img/appvm/blk /usr/lib/spectrum/img/appvm/vmlinux
+ /run/configs/${id}
+}
+
+if { ln -s /run/configs/${id} ${dir}/config }
+
+if { create-vm-dependencies $id }
+
+piperw 4 3
+background {
+ fdclose 3
+ fdmove 0 4
+
+ # Wait for the VMM to be up, then start the VM.
+ if { redirfd -w 1 /dev/null head -1 }
+ vm-start $id
+}
+fdclose 4
+
+foreground { run-vmm $id }
+fdclose 3
+
+if {
+ forx -pE service {
+ dbus
+ vhost-user-fs
+ vhost-user-gpu
+ xdg-desktop-portal-spectrum-host
+ }
+ s6-instance-delete /run/service/${service} $id
+}
+
+if {
+ elglob -0 flatpak_dir_mounts /run/configs/${id}/fs/flatpak/*/*/*/*/*
+ forx -E mount {
+ ${dir}/fs/doc
+ /run/configs/${id}/fs/flatpak/repo/config
+ $flatpak_dir_mounts
+ /run/configs/${id}/fs/flatpak
+ ${dir}/fs/config
+ }
+ umount $mount
+}
+
+rm -r $dir /run/configs/${id}
--
2.51.0
next prev parent reply other threads:[~2025-11-13 12:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-13 12:04 [PATCH 1/3] tools/mount-flatpak: init Alyssa Ross
2025-11-13 12:04 ` [PATCH 2/3] img/app: run Flatpak applications Alyssa Ross
2025-11-13 12:04 ` Alyssa Ross [this message]
2025-11-14 19:36 ` [PATCH 3/3] host/rootfs: add run-flatpak script Demi Marie Obenour
2025-11-24 15:25 ` Alyssa Ross
2025-11-13 19:25 ` [PATCH 1/3] tools/mount-flatpak: init Demi Marie Obenour
2025-11-14 11:12 ` Alyssa Ross
2025-11-14 22:52 ` Demi Marie Obenour
2025-11-15 12:00 ` Alyssa Ross
2025-11-15 12:01 ` Alyssa Ross
2025-11-18 1:37 ` Demi Marie Obenour
2025-11-14 19:11 ` Demi Marie Obenour
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251113120452.65711-3-hi@alyssa.is \
--to=hi@alyssa.is \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).