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 8AAB29D1D; Sat, 13 Dec 2025 16:21:02 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id CAB679D12; Sat, 13 Dec 2025 16:21:00 +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-a4-smtp.messagingengine.com (fout-a4-smtp.messagingengine.com [103.168.172.147]) by atuin.qyliss.net (Postfix) with ESMTPS id 160D09D10 for ; Sat, 13 Dec 2025 16:21:00 +0000 (UTC) Received: from phl-compute-01.internal (phl-compute-01.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id DAF78EC0585 for ; Sat, 13 Dec 2025 11:20:57 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Sat, 13 Dec 2025 11:20:57 -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=fm3; t=1765642857; x= 1765729257; bh=F2lfu3v3n2TjWLjh08zksSJv/+6K2QBg3R+wKq/6sRU=; b=N Rh3mItt79ZHP5dA8qotXG1PkFmxd11mXAu48hG6phmnkbVqNTjNheUSS97SCm3pU ogR8dHi+KrSWfMzSTju06P1+LEdpxDX3NznN97xLwgDsWSTVHdX052p7eSmyimrP v9KjzRj9m/i9BGKV7g2aNlwZct4jCf8UPfdy/Iq4qO+Rl8HI0JUZ1y29/Sn6BqO1 RatsTZQWhxNwpo1qgCrzPs1e0GEXgLQyQipWSOPPM87eXJEXpgFJCttugOYfrxPa D0jRXU22Jg0ADCsu/D3/RII74RjNnGc6GZuWneRo/NFflmuSqSJRUl5kcex8q5mr Dw+joojDVv+OGO+6mQ4CQ== 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= fm1; t=1765642857; x=1765729257; bh=F2lfu3v3n2TjWLjh08zksSJv/+6K 2QBg3R+wKq/6sRU=; b=NcXDGw+5b1wLcP3Cwt7jQIVF5SIGG13ZaeVjvVsf7H83 yEY4jca2bMfiIOk+v6HGkqVEzM+zRf3g4F4MGYRNlIkoJOL9AWhsIVxUZAhyNUMW hhi3n31N8FNB3LDVmdyhve4g2JDbaYdmahxCouZeUKRyTnpzAvWpP1OS8kU8UdF5 q2Jf31kvVechMo72tDzEm1MNnkL0zc6eGf/vFSX8VpZOrXGF//jCgVmxpBeIQKz4 dv3HldCHsJTVPWGwFYISTZFhFPzqEkI5Pccvs60/sdCIScDYIEGfqAwVUOB2VPVV wIXLc0XXgmpNxOOXElvixpAOszhl255PV9tHpGHkYQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgdefudehfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertdertd dtnecuhfhrohhmpeetlhihshhsrgcutfhoshhsuceohhhisegrlhihshhsrgdrihhsqeen ucggtffrrghtthgvrhhnpefgfedukedvleeileeludefveehgeelgfegvddujedvtdffue euveffheeljeekvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehhihesrghlhihsshgrrdhishdpnhgspghrtghpthhtohepuddpmhhouggvpe hsmhhtphhouhhtpdhrtghpthhtohepuggvvhgvlhesshhpvggtthhruhhmqdhoshdrohhr gh X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sat, 13 Dec 2025 11:20:57 -0500 (EST) Received: by fw12.qyliss.net (Postfix, from userid 1000) id 91BF47814D4A; Sat, 13 Dec 2025 17:20:41 +0100 (CET) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 4/4] host/rootfs: clean up obsolete tmp dirs on mount Date: Sat, 13 Dec 2025 17:16:37 +0100 Message-ID: <20251213161637.510752-4-hi@alyssa.is> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251213161637.510752-1-hi@alyssa.is> References: <20251213161637.510752-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: FNMJPVLVK2HHNARXMJCJG4MU5HKR66YJ X-Message-ID-Hash: FNMJPVLVK2HHNARXMJCJG4MU5HKR66YJ 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: In the ideal case, these will be cleaned up when the VM running them exits, but there's always the possibility that there are some left over, in which case mount time is the perfect time to clean up, when we can be reasonably sure nothing else is still accessing them. Signed-off-by: Alyssa Ross --- host/rootfs/image/usr/bin/mount-userdata | 36 ++++++++++++++++-------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/host/rootfs/image/usr/bin/mount-userdata b/host/rootfs/image/usr/bin/mount-userdata index 6e4ac47d..2e130b83 100755 --- a/host/rootfs/image/usr/bin/mount-userdata +++ b/host/rootfs/image/usr/bin/mount-userdata @@ -7,18 +7,32 @@ backtick -D "" uuid { blkid -o value -s UUID -- $1 } -multisubstitute { - importas -Siu 0 - importas -Siu 1 - importas -Siu uuid -} - -case $uuid { - "" { - fdmove -c 1 2 - printf "%s: '%s' does not have a UUID\n" $0 $1 +if { + multisubstitute { + importas -Siu 0 + importas -Siu 1 + importas -Siu uuid } + + case $uuid { + "" { + fdmove -c 1 2 + printf "%s: '%s' does not have a UUID\n" $0 $1 + } + } + + mount -m -t btrfs -o nosuid,nodev,noexec,nosymfollow -- $1 /media/${uuid} +} + +importas -Siu uuid + +if { + if -t { test -d /media/${uuid}/Spectrum/data/spectrum/storage } + find /media/${uuid}/Spectrum/data/spectrum/storage + -mindepth 1 + -maxdepth 1 + -name tmp.* + -exec rm -rf -- {} ; } -if { mount -m -t btrfs -o nosuid,nodev,noexec,nosymfollow -- $1 /media/${uuid} } printf "%s\n" /media/${uuid} -- 2.51.0