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 180221D831; Fri, 05 Dec 2025 16:23:08 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 34FA01D80D; Fri, 05 Dec 2025 16:23:01 +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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-yx1-xb12d.google.com (mail-yx1-xb12d.google.com [IPv6:2607:f8b0:4864:20::b12d]) by atuin.qyliss.net (Postfix) with ESMTPS id 7259F1D809 for ; Fri, 05 Dec 2025 16:23:00 +0000 (UTC) Received: by mail-yx1-xb12d.google.com with SMTP id 956f58d0204a3-6432842cafdso2058308d50.2 for ; Fri, 05 Dec 2025 08:22:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764951778; x=1765556578; darn=spectrum-os.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=xaTv2KzEjFS/ppW+wBEKuNX/Xiidieo+QU/3LswjnEY=; b=eTDo7tUy1A0m1UA4yTrX0Y9z/HA93T7MjFe4ClElI+4v7gwZ5opSM3IOtgCll8kxmH dIKQ1ybYTijS3no2ib6bd6ofwkjPIVWfMoPcPLvCHc3pFpYXrExWb+xHI40LIcXQKOUi ViZQVHMbRoM1RIdaTyZJBaCAPe6posgKVMVjLB3EwZA6mT5r654y1lgRuWaSqke1KKdg WOL2DBHNVUCUZkShNiqSKSK9pDCRmYg+fDP88qbnKk+mNpwGZMPXSRWVBFOmHejT0PzS 2qtbv5AR00LHkBmxRAmbh+a4yQvc7B4Li/8cjwdqATtjDHLQu4ugHaIknOwLInSM6mvi kZwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764951778; x=1765556578; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=xaTv2KzEjFS/ppW+wBEKuNX/Xiidieo+QU/3LswjnEY=; b=CK/UQfmebgk1JMY8Kf1i36nGXK9SVtikL52sSLOcD2qymY6VSTCievS022gbQeD8fh G+3mvJt/g+tLKCxxG+xLHppN6bJ66FG5GH2Wujy6NE5X2Aly8GYAEtAPBjknoGrqAHln HxffDZ9gUfu5RERAk81TBA0L+yyXGA0h5fEnZ0FZh26yfARV87LysoWSSW/BaYAx4Syf Cb5kgjjLYgTmQLFjcDkw5PR0LXRfW22soRtIB4Z4LobktEVucJ8krqCEyV+darsJeRuN G8oXAMMnmKL6moZaSrY+KELGpbCS+Pnp3/G9Fuy2dJLDWWleSzn6COZfbbyg/EmnQtSS ZF7Q== X-Gm-Message-State: AOJu0YwfW8bE1moAsJTWqli2viYg8fY1TRwRUriouie8nMbFACBgEiRA VKf4FWPn7h97nT2nQpD5ENtWCW8M+JbEzc3/L+OGKCE0lAVxX/dcT1fqQPHK/w== X-Gm-Gg: ASbGncvLaD9dYSBRTNfrnUFF7iQBzv0u33OHLDOjcCFZyyezxC0D2gwA/uRBp+uLLqX r6C1JkmE5q0lDN04UfJ+dlTSRtPINrpRLzibUr7ui4SVs9wKc9bIaP9xtdHYcZvDiQCZDm2j5je 8lpyrRoK+paR9d+zPIChZr5M0y5tDpvbenq5bg4C9foJrSt/AZuGCVfy8TpWyr+Hu54RoSau09j BNfvUfVPTpXoeuksedp1Ob7sMWp75NrKsFEpdPAakNK6kU1bKMIdx5jByukWzWK860yWY4nNmf5 F8yYMcBQSQMYB1Qc+nG1Z1X2RC3xJa4zzo3UHwNcuQp9oFaBoWzDbFlfQLey/LXqxKZdfiRMJYD c8YavCTFYpUZqhnBgDnavB4Lbl9QKvApH/OySySyCdAm7whNHnOzb+Ru51jvYsTCFTA3fMhwVuC RQ2WkMaHRVGEkMl7bkIaNzrObXcATCdBg+dxoo1MntUqWLkJ6Sn3DYvl1ObacGINSsmXLXkV9WV qWGFPkqpZQGdrJpPSt4/TLcvw3zriH90Sg/XVLMnWCMuQ== X-Google-Smtp-Source: AGHT+IGSPG+kSNZD9jxoI5T7NQok6EOru5pDW3UsqHzh0XZz462yp9Gua0Y3+lhFqcFcen+9JW9C6g== X-Received: by 2002:a05:690e:11c3:b0:640:d5c9:5954 with SMTP id 956f58d0204a3-6443704e84dmr8167075d50.59.1764951777651; Fri, 05 Dec 2025 08:22:57 -0800 (PST) Received: from localhost.localdomain (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with UTF8SMTPSA id 956f58d0204a3-6443f5bc2f3sm1927317d50.22.2025.12.05.08.22.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 08:22:57 -0800 (PST) From: Demi Marie Obenour Date: Fri, 05 Dec 2025 11:22:01 -0500 Subject: [PATCH 1/4] tools: Use with_resolver_flags instead of mutation MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251205-better-mount-flatpak-v1-1-229a81366091@gmail.com> References: <20251205-better-mount-flatpak-v1-0-229a81366091@gmail.com> In-Reply-To: <20251205-better-mount-flatpak-v1-0-229a81366091@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764951720; l=2134; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=vKzuXvqW6AbJIIbZpN3Lp/bTBBuV6qUQAXCB6jrXasw=; b=C2y5NIAaOzEniR9ElkI7efUBvR9j0MZ/S8h+sEDRP7wLvIJgdWCgphSVLRmPyvYcBz1iUHp5x PiyEGg3iwB8ALrOw5En9i9hGTmhAIBpbooHFSf0JWi/7lypsSFouJG/ X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: RGQAGDSUXBSCQTQPQVXKE2ETHVGKXIVC X-Message-ID-Hash: RGQAGDSUXBSCQTQPQVXKE2ETHVGKXIVC X-MailFrom: demiobenour@gmail.com 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 CC: Demi Marie Obenour , Alyssa Ross 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: No functional change. Signed-off-by: Demi Marie Obenour --- tools/mount-flatpak/src/main.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/mount-flatpak/src/main.rs b/tools/mount-flatpak/src/main.rs index 6fc05569b9736e70311a7e2e20af4131a8d66303..dca42e5007e52b24c9a4b6940d5667f770a64bd0 100644 --- a/tools/mount-flatpak/src/main.rs +++ b/tools/mount-flatpak/src/main.rs @@ -102,15 +102,15 @@ fn run(mut args: ArgsOs) -> Result<(), String> { ex_usage(); } - let mut user_data = - Root::open(&user_data_path).map_err(|e| format!("opening user data partition: {e}"))?; - user_data.set_resolver_flags(ResolverFlags::NO_SYMLINKS); + let user_data = Root::open(&user_data_path) + .map_err(|e| format!("opening user data partition: {e}"))? + .with_resolver_flags(ResolverFlags::NO_SYMLINKS); - let mut source_installation_dir = user_data + let source_installation_dir = user_data .open_subpath(&installation_path, OpenFlags::O_PATH) .map(Root::from_fd) - .map_err(|e| format!("opening source flatpak installation: {e}"))?; - source_installation_dir.set_resolver_flags(ResolverFlags::NO_SYMLINKS); + .map_err(|e| format!("opening source flatpak installation: {e}"))? + .with_resolver_flags(ResolverFlags::NO_SYMLINKS); std::fs::create_dir("flatpak") .map_err(|e| format!("creating target flatpak installation: {e}"))?; @@ -124,8 +124,8 @@ fn run(mut args: ArgsOs) -> Result<(), String> { | OpenTreeFlags::AT_SYMLINK_NOFOLLOW, ) .map_err(|e| format!("opening target flatpak installation: {e}"))?; - let mut target_installation_dir = Root::from_fd(target_installation_dir); - target_installation_dir.set_resolver_flags(ResolverFlags::NO_SYMLINKS); + let target_installation_dir = + Root::from_fd(target_installation_dir).with_resolver_flags(ResolverFlags::NO_SYMLINKS); let mut full_app_path = installation_path.join("app"); full_app_path.push(&app); -- 2.52.0