From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 3FD96C4EF; Wed, 26 Nov 2025 21:34:51 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 00213C415; Wed, 26 Nov 2025 21:34:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_MISSING,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fout-b4-smtp.messagingengine.com (fout-b4-smtp.messagingengine.com [202.12.124.147]) by atuin.qyliss.net (Postfix) with ESMTPS id 9511BC36B for ; Wed, 26 Nov 2025 21:34:37 +0000 (UTC) Received: from phl-compute-05.internal (phl-compute-05.internal [10.202.2.45]) by mailfout.stl.internal (Postfix) with ESMTP id 95C651D0005B for ; Wed, 26 Nov 2025 16:34:35 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Wed, 26 Nov 2025 16:34:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1764192875; x= 1764279275; bh=okpgMCg6SlJFflmV716SWfXwHHgXWNPS4MDFDyRQRkQ=; b=c EAoWHONb+mL0uyBlK6L7yLEiz6deAJhEO0VwY+hKC0kCOoloBhIsGOJrS1rRp1jA 83Lg77dGNkUZKUkSkr3/iZLdmv+pFBohFo4crbfV95cRJh89SzO0slzPoVTFRoDR EErFeT7X4V72a7IsyUpq5J94NIAmVS4JgJpFaiG3GcuOsfX72hSTmME3F0qFmvF0 TVOeT6rW5utFRvzgR9jg5/HSBdCLgtmTm8bYmHZdOHWKB5X2HxAXlCews6Ewhnvl XSK0HtaE2eJYD8PYfDuuKGanJpgxSOxdw8FLHlh65dN3OsPQetjoW6qBoGvVAjGu 5pD/taoAyORNTBeFSQ+nw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1764192875; x=1764279275; bh=okpgMCg6SlJFflmV716SWfXwHHgX WNPS4MDFDyRQRkQ=; b=oIZ+mM8WHDFLCMxJrOQY54pv8Tj6A7xJK2QFpAjIrC56 +EI+0Wi+YwUkwO4QFIOOZsFOZSYfDogMik0ClFh32+ic00GuCKMn8IdLB2wX156Y WPKxGyHj9/paO4KG9Vjo1L2ZFlfYh7jrPMJ7950EDtTA2uK3tgQqsFKKYXBG4MAb s45nnUDAzf3H3F6XHaXnYiYet/4Tc9MMukMvFTWt/1Vv/7jgH4kzhZTudjqTU9V3 3c0IkdqwayZlUpH4B2Fi+Do/M8A+hxH6qWUIX7ye9q1ZgiRZNl53tV79/A5oXcgR eEsc0NHVEutC4XjopzuSdaWr1JN+Oja3LVdukedZEA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggddvgeehgeegucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekredtre dttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhisheq necuggftrfgrthhtvghrnhepgfefudekvdelieelledufeevheeglefggedvudejvddtff euueevffehleejkedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomhephhhisegrlhihshhsrgdrihhspdhnsggprhgtphhtthhopedupdhmohguvg epshhmthhpohhuthdprhgtphhtthhopeguvghvvghlsehsphgvtghtrhhumhdqohhsrdho rhhg X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Wed, 26 Nov 2025 16:34:34 -0500 (EST) Received: by fw12.qyliss.net (Postfix, from userid 1000) id D26482981B3F; Wed, 26 Nov 2025 22:34:18 +0100 (CET) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 04/13] img/app: wayland-proxy-virtwl: run as non-root Date: Wed, 26 Nov 2025 22:33:57 +0100 Message-ID: <20251126213407.1773744-4-hi@alyssa.is> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251126213407.1773744-1-hi@alyssa.is> References: <20251126213407.1773744-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: FVMJWFJ66GTVWVCOGNTORULXHHB6CITE X-Message-ID-Hash: FVMJWFJ66GTVWVCOGNTORULXHHB6CITE X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: nsswitch.conf needs to exist for s6-envuidgid to be able to find supplementary groups. Signed-off-by: Alyssa Ross --- img/app/file-list.mk | 2 ++ img/app/image/etc/group | 1 + img/app/image/etc/group.license | 2 ++ img/app/image/etc/mdev.conf | 2 +- img/app/image/etc/nsswitch.conf | 0 img/app/image/etc/passwd | 1 + img/app/image/etc/s6-rc/wayland-proxy-virtwl/run | 2 ++ 7 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 img/app/image/etc/group create mode 100644 img/app/image/etc/group.license create mode 100644 img/app/image/etc/nsswitch.conf diff --git a/img/app/file-list.mk b/img/app/file-list.mk index 6934975..c7cd82a 100644 --- a/img/app/file-list.mk +++ b/img/app/file-list.mk @@ -4,11 +4,13 @@ FILES = \ image/etc/dbus-1/session.conf \ image/etc/fstab \ + image/etc/group \ image/etc/mdev.conf \ image/etc/mdev/iface \ image/etc/mdev/listen \ image/etc/mdev/virtiofs \ image/etc/mdev/wait \ + image/etc/nsswitch.conf \ image/etc/passwd \ image/etc/pipewire/pipewire.conf \ image/etc/resolv.conf \ diff --git a/img/app/image/etc/group b/img/app/image/etc/group new file mode 100644 index 0000000..4add88f --- /dev/null +++ b/img/app/image/etc/group @@ -0,0 +1 @@ +wayland:x:1:wayland diff --git a/img/app/image/etc/group.license b/img/app/image/etc/group.license new file mode 100644 index 0000000..0d3d47c --- /dev/null +++ b/img/app/image/etc/group.license @@ -0,0 +1,2 @@ +SPDX-License-Identifier: CC0-1.0 +SPDX-FileCopyrightText: 2025 Alyssa Ross diff --git a/img/app/image/etc/mdev.conf b/img/app/image/etc/mdev.conf index df215b9..b7c0c5b 100644 --- a/img/app/image/etc/mdev.conf +++ b/img/app/image/etc/mdev.conf @@ -4,7 +4,7 @@ -$MODALIAS=.* 0:0 0 ! +importas -Siu MODALIAS modprobe -q $MODALIAS $INTERFACE=.* 0:0 0 ! +/etc/mdev/iface $MODALIAS=virtio:d0000001Av.* 0:0 0 ! +/etc/mdev/virtiofs -dri/card0 0:0 660 +background { /etc/mdev/listen card0 } +dri/card0 wayland:wayland 660 +background { /etc/mdev/listen card0 } snd/controlC0 0:0 660 +background { /etc/mdev/listen controlC0 } # Don't change mode of other device nodes created by devtmpfs. diff --git a/img/app/image/etc/nsswitch.conf b/img/app/image/etc/nsswitch.conf new file mode 100644 index 0000000..e69de29 diff --git a/img/app/image/etc/passwd b/img/app/image/etc/passwd index 5d35578..31e5773 100644 --- a/img/app/image/etc/passwd +++ b/img/app/image/etc/passwd @@ -1 +1,2 @@ root:x:0:0:System administrator:/run/root:/bin/sh +wayland:x:1:1:wayland-proxy-virtwl service user:/:/usr/bin/nologin diff --git a/img/app/image/etc/s6-rc/wayland-proxy-virtwl/run b/img/app/image/etc/s6-rc/wayland-proxy-virtwl/run index 380a833..86d7f63 100755 --- a/img/app/image/etc/s6-rc/wayland-proxy-virtwl/run +++ b/img/app/image/etc/s6-rc/wayland-proxy-virtwl/run @@ -26,4 +26,6 @@ export LISTEN_FDS 2 export LISTEN_FDNAMES wayland:x11 getpid LISTEN_PID +s6-setuidgid wayland + wayland-proxy-virtwl --virtio-gpu --x-display=0 -- 2.51.0