From patchwork Tue May 27 09:26:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 42928 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EEFE127BC4A; Tue, 27 May 2025 10:28:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5A8F727BC49 for ; Tue, 27 May 2025 10:28:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJqbN-0006HR-GD; Tue, 27 May 2025 05:28:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uJqbK-0006HI-JU for guix-patches@gnu.org; Tue, 27 May 2025 05:28:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uJqbK-0000MX-9X for guix-patches@gnu.org; Tue, 27 May 2025 05:28:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=SVWOhYZTgn+WefhxaHpsLjbSKYAWNA/o/HCxt/Casp4=; b=iDHndbFACD4w/lJkSYk3P8EKsRwwf+NSytJgJFdl45FG1gIonnXvbzHgZYShV3eywb5uDIvd/qN3xFTo9C2Bl8ImPis8oiI62oDswT+tOgEPelPYxJLjTZqMNnimIOeqB/Ex5C3+z1UZvxfvT+l6GSvpcSegHNdmGAwdmUYKhLLBVpmTLk34/NaPMGHukma2XiAGASJ7heZGauHtWkppy+rbaKyb6iIvPu7wcQaX+XQb4BexpqhRRAUdjwKg12NRvtgW94tbc66qXApYWyyy1rXtC+HIqPSd7dzAs01U+6dLrUtTSnq6bWmPvax0APmx1PbxOm0Fdg65IYaxt4m47w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uJqbK-0003VC-5p for guix-patches@gnu.org; Tue, 27 May 2025 05:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78603] [PATCH] services: readymedia: Respect SUDO_HOME if configuring for home. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 May 2025 09:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78603 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78603@debbugs.gnu.org Cc: Sughosha X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174833807813440 (code B ref -1); Tue, 27 May 2025 09:28:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 May 2025 09:27:58 +0000 Received: from localhost ([127.0.0.1]:38446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uJqbG-0003Uh-7e for submit@debbugs.gnu.org; Tue, 27 May 2025 05:27:58 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58688) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uJqbC-0003U3-U2 for submit@debbugs.gnu.org; Tue, 27 May 2025 05:27:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uJqb6-0005iw-4F for guix-patches@gnu.org; Tue, 27 May 2025 05:27:48 -0400 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uJqay-0000Ec-KG for guix-patches@gnu.org; Tue, 27 May 2025 05:27:47 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A7A8425D8B; Tue, 27 May 2025 11:27:34 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id vpaMeN9Ot3Kj; Tue, 27 May 2025 11:27:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1748338054; bh=JpNhUzdNYIREUrDaTGJbA7o/qcNaTvOpCCMnms7/Dt8=; h=From:To:Cc:Subject:Date; b=hixvSiTS7pjxps461ALo261bQJ6CdfXziw7TCsqTspFnbB1BTXtN4QmrbKnNm4tux m1b78+zRc9tsdp5Vrk/zsC1FzQKBwfwf+CfvYueWM3nj7MQ8zInrbZyq23jhCikIDm 4muiKKNv5SMNG16VVJ/GTubC5G2Bi9c1qTTj17U1o94XmLotYWEMv9ww8gGrlcnXjx t0qvfyQ+SYeC7Z1cZja9XLAQbN1KoVdigJJewygs1Flz0zXP+oUe8kfZWxRGqtsOAR 0+K+v48XVRxaZICAM4lq12fHabrQxUstZy9GcskE7+11zwsFJ1vICwuHnWc7jqKAsZ jau8Icou+8LXA== Date: Tue, 27 May 2025 14:56:16 +0530 Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=sughosha@disroot.org; helo=layka.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This fixes the service that is configured for a home environment, defined with "guix-home-service-type" in a system configuration, using "sudo", with "/root" as "$HOME" instead of the required home directory. * gnu/services/upnp.scm (readymedia-configuration)[cache-directory]: Respect SUDO_HOME if configuring for home. [log-directory]: Ditto. Change-Id: Ie6905c0b83608f91582671cde9d866079178f192 --- gnu/services/upnp.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) base-commit: c15f786f8936502249b639220997094fdbf7f1e8 diff --git a/gnu/services/upnp.scm b/gnu/services/upnp.scm index 8267b1e53af..edd55594e38 100644 --- a/gnu/services/upnp.scm +++ b/gnu/services/upnp.scm @@ -74,19 +74,22 @@ (define-record-type* (default #f)) (cache-directory readymedia-configuration-cache-directory (default (if for-home? - (string-append (or (getenv "XDG_CACHE_HOME") - (string-append - (getenv "HOME") "/.cache")) - "/readymedia") - %readymedia-default-cache-directory))) + (if (getenv "XDG_CACHE_HOME") + (string-append (getenv "XDG_CACHE_HOME") + "/readymedia") + (string-append (or (getenv "SUDO_HOME") + (getenv "HOME")) + "/.cache/readymedia")) + %readymedia-default-cache-directory))) (log-directory readymedia-configuration-log-directory (default (if for-home? - (string-append (or (getenv "XDG_STATE_HOME") - (string-append - (getenv "HOME") - "/.local/state")) - "/readymedia") - %readymedia-default-log-directory))) + (if (getenv "XDG_STATE_HOME") + (string-append (getenv "XDG_STATE_HOME") + "/readymedia") + (string-append (or (getenv "SUDO_HOME") + (getenv "HOME")) + "/.local/state/readymedia")) + %readymedia-default-log-directory))) (friendly-name readymedia-configuration-friendly-name (default #f)) (media-directories readymedia-configuration-media-directories)