Received: (at 78603) by debbugs.gnu.org; 12 Jun 2025 12:40:35 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jun 12 08:40:35 2025 Received: from localhost ([127.0.0.1]:57215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uPhER-0003Au-D4 for submit <at> debbugs.gnu.org; Thu, 12 Jun 2025 08:40:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49196) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1uPhEN-0003AK-TT for 78603 <at> debbugs.gnu.org; Thu, 12 Jun 2025 08:40:32 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1uPhEF-0000KL-QT; Thu, 12 Jun 2025 08:40:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=A7hanQ23X+m5ZOSYdrOYKrCS+TbrDPTQcfgvLuVa9uI=; b=o1GEEQN+Z5My2prXtOHH 0K08z+cN7opt3PTNMxryQjLtI85kbpneyjytulxgwxcIxYFexHwuaRT77zzMre/dImD6sOjQ0/PSp U8Df1JZM5TBvtobPkx8xmQYp0ujn85AEuwZWTgFucYa1hYtX/w4JEKaSL/19AQ0G4VDHJkFh9GLsf bfYzFmyX6VkRefm37VE0HdYXZilS0xtbG/bOTwO0/ur6fdNGtMBgCbGzJo16D7DSzjuwhl57pR8g6 hXScUnBji1TmrLtFLaCi9np7SodDetglsViyMpBGfwALMYPourh22zpyGrwpy6Jqu+9K6DnhBUecs ua6uNmSpVi1bhg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Sughosha <sughosha@HIDDEN> Subject: Re: bug#78603: [PATCH] services: readymedia: Respect SUDO_HOME if configuring for home. In-Reply-To: <847e37421c511c1d959d01047401e379d81a3388.1748352495.git.sughosha@HIDDEN> (sughosha@HIDDEN's message of "Tue, 27 May 2025 18:58:15 +0530") References: <abfbb47782cfe6c6800b86731658c4ed9c4e524a.1748337976.git.sughosha@HIDDEN> <847e37421c511c1d959d01047401e379d81a3388.1748352495.git.sughosha@HIDDEN> Date: Thu, 12 Jun 2025 09:58:32 +0200 Message-ID: <87h60lfl1z.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -1.2 (-) X-Debbugs-Envelope-To: 78603 Cc: 78603 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.2 (--) Hi, Sughosha <sughosha@HIDDEN> writes: > This fixes readymedia configured by a different user. > > * gnu/services/upnp.scm (readymedia-configuration)[cache-directory]: Upda= te > path. > [log-directory]: Ditto. > > Change-Id: I629c937973ca46bcd6e60382aa7576b9859515be [...] > (default (if for-home? > - (string-append (or (getenv "XDG_CACHE_HO= ME") > - (string-append > - (getenv "HOME") "/.c= ache")) > - "/readymedia") > - %readymedia-default-cache-directory))) > + ".cache/readymedia" > + %readymedia-default-cache-directory))) A better solution, to avoid brittleness associated with relative file names, is to turn =E2=80=98cache-directory=E2=80=99 into a gexp that w= ould =E2=80=98getenv=E2=80=99 as above and/or =E2=80=98getpw=E2=80=99 to determine the cache directory na= me. The (shepherd support) module provides =E2=80=98%user-log-dir=E2=80=99 etc.= , but unfortunately it lacks =E2=80=98%user-cache-dir=E2=80=99. HTH, Ludo=E2=80=99.
guix-patches@HIDDEN:bug#78603; Package guix-patches.
Full text available.Received: (at 78603) by debbugs.gnu.org; 27 May 2025 13:56:55 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 27 09:56:55 2025 Received: from localhost ([127.0.0.1]:41917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uJunW-0001Sx-Qj for submit <at> debbugs.gnu.org; Tue, 27 May 2025 09:56:55 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]:51452) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <sarg@HIDDEN>) id 1uJunS-0001Sb-Be for 78603 <at> debbugs.gnu.org; Tue, 27 May 2025 09:56:51 -0400 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-604bff84741so3431917a12.2 for <78603 <at> debbugs.gnu.org>; Tue, 27 May 2025 06:56:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1748354204; x=1748959004; darn=debbugs.gnu.org; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=ncTtFsjI9KvGW6h1XgTUzzylB5XcoZKmVc3yOTtMAYI=; b=ZICy1CBChCkclPmaNw99PdV9+tpPsmjakNyjKxjVV/ymDC2jGAWtHpP5sy/41VfA8y pcqO5NF5rfLxZCxO9LD/+EnFssfHbJvVEmEabrK9tNaKqivBQWhvQt7aFrTyQHIbcbbW cvyGZDP+1AH9ycDOjZ+dMyFXruIsE8/iqJzZSBRf8/oiBPRlBRTDFMpies8gNcObA1rQ Buoov1xQuDTiEiDMClGoEPRriQbH5D9j7b+5xiO3LbQRDlTuBrFTU0Qm+On/9SFKnr/Q NMtNJYeYVQDOIP1O8yRrqBoQxpogmDX80RHAeuyncp5E8d9lCiQzvOrWJVxxdLbigH5y bhGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748354204; x=1748959004; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ncTtFsjI9KvGW6h1XgTUzzylB5XcoZKmVc3yOTtMAYI=; b=XU9A8ODFpETM1LmUjsHlyo+wzMj9a5DAhmHVAnTx5w3bAZaxYKME76eAeKvnpdqhiH cNm9ePYXKnBsoLG2AYcdFC9cnonduObhJPMRmdacorbncySA9cUXXHamWNsi/55XfNtz 4KNoYxRQAdcgDKrBKzFMIZIeTjaGoHzN5kCx6lj4cWbrsAPPmKD4cy5hpwO7NkqPxSly HdmDbKPSy8JgWaLrt7tWuHUiEJRmrwYlPnzyKo8g5LZm5g1BLlrmHZZRZZjH5WBN8/BK fkrAmxzTVqnZ/qyfcy8cR1J0yiNc+ZED42Tugoa1Pc1mVB07BMnyL8iB2tFRvFgFM9zQ jkug== X-Gm-Message-State: AOJu0Yz7c8dQ1IBSvC/1/9Ffzd4t68uki+ZvQ6fRa4qb0fDiBlCnyCTU zObNJW5AemTP2zmrPo7UkLgM2DbR/0GV/4wSyarA0y6X5FSmpoELOtPTf4nuDmS+/r8= X-Gm-Gg: ASbGncsPbTEYa1Utl0KvxcG9cdOmwV+b2ezNuARTAX49V04t4nBpldlnlt5HxgVXrZm oV05iFFwV2QMNRX6jZ1YPgbrAX3WXLvWgHscpOGwjeE2ev3/dXROU4tkuufSBlkMQsnhq8GaOjD NYvXr6ygBsTD9tDs1TBKra/uh65zs6vZ8p092RbFSfjmxVw8dVe8VcacsxEtYU8b66JSaEuLgY6 XBGUFCGjeEVHPE8yo8kz22ZiedOwJ+PQiXKkxtLIVhPEo4N1fQF12FqqwxBDEcl9syDxqSKk3ls JT3uiic3qljuOPIGkdjmZQk9VHAlDC/AptLG8TMM85sw212w X-Google-Smtp-Source: AGHT+IEnhcrFnKfHEwCNyFNddIm3ojMECv8MdNbA0AAXiaFQ4bicXbS3cFJVQ/jwNgdXBFBD7IJ3Jw== X-Received: by 2002:a17:907:c26:b0:ace:6f8e:e857 with SMTP id a640c23a62f3a-ad85ae07f7fmr1155572466b.0.1748354203590; Tue, 27 May 2025 06:56:43 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad52d438384sm1866534966b.106.2025.05.27.06.56.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 May 2025 06:56:43 -0700 (PDT) From: Sergey Trofimov <sarg@HIDDEN> To: Sughosha <sughosha@HIDDEN> Subject: Re: [bug#78603] [PATCH] services: readymedia: Respect SUDO_HOME if configuring for home. In-Reply-To: <5891857.DvuYhMxLoT@HIDDEN> (sughosha@HIDDEN's message of "Tue, 27 May 2025 18:57:31 +0530") References: <877c22s2ex.fsf@HIDDEN> <5891857.DvuYhMxLoT@HIDDEN> User-Agent: mu4e 1.12.11; emacs 30.0.92 Date: Tue, 27 May 2025 15:56:42 +0200 Message-ID: <87v7pmqhr9.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78603 Cc: 78603 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Sughosha, Sughosha <sughosha@HIDDEN> writes: [...] > Using relative paths without any variable is working. I will send v2 patch. > I've also noticed a couple other issues: - `(getuid)` used in `readymedia-configuration->config-file`. It could be removed altogether, no need to specify `user=` for home installations - log_dir seem to be ineffective when starting the app with -s. It logs to stdout when running in foreground. You can just remove this parameter - #:log-file for a shepherd service should be located either in %user-log-dir or "/var/log". Please check e.g. mcron service - not sure if least-authority-wrapper would work for symlinked media directories (see wide_links config option)
guix-patches@HIDDEN:bug#78603; Package guix-patches.
Full text available.Received: (at 78603) by debbugs.gnu.org; 27 May 2025 13:52:35 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 27 09:52:35 2025 Received: from localhost ([127.0.0.1]:40411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uJujL-0000md-4h for submit <at> debbugs.gnu.org; Tue, 27 May 2025 09:52:35 -0400 Received: from layka.disroot.org ([178.21.23.139]:51530) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <sughosha@HIDDEN>) id 1uJujH-0000mO-Jw for 78603 <at> debbugs.gnu.org; Tue, 27 May 2025 09:52:33 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2ACEE25D16 for <78603 <at> debbugs.gnu.org>; Tue, 27 May 2025 15:52:29 +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 Iic_4V6k92NM for <78603 <at> debbugs.gnu.org>; Tue, 27 May 2025 15:52:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1748353948; bh=7CIynQbwq4W9GpCnKR5F43wH9uZHOdSwvMxckfblx+c=; h=From:To:Subject:Date:In-Reply-To:References; b=Zy3SHv+CoG9bvyHU+A6mu11XEZxsJ2s1a9XGpAawcjqfA1Y/G427lJJoHleO/B2He H+3fpEbvCWGP9dX+PW3/Z/xc7oiFXaUBXO+8kiUl5FMiIAXgqBd6lvEIxrfA3cGpiM YzHIoRyC27S+FZTMJTziqqWKp+VwhZp3JYnixF2Y3peT64v5ezR4vadWcO4xBerivJ Xn2WRtJLP9eXixHAHyH3c9NNn+d3A89ngSERs1KkHrKByMnHEyWcXSK6MD3stD9Ah4 retCQYWxymTqCM8ZhkHEDdYo/Luj4zcWc7rxut0IjSlXScBs6XYyW0mOCtTDCYHFU4 djCOal7heTIMw== From: Sughosha <sughosha@HIDDEN> To: 78603 <at> debbugs.gnu.org Subject: Re: [PATCH v2] services: readymedia: Use relative paths to cache and log directories for home. Date: Tue, 27 May 2025 19:22:09 +0530 Message-ID: <6163579.lOV4Wx5bFT@HIDDEN> In-Reply-To: <847e37421c511c1d959d01047401e379d81a3388.1748352495.git.sughosha@HIDDEN> References: <847e37421c511c1d959d01047401e379d81a3388.1748352495.git.sughosha@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart5017014.31r3eYUQgx"; micalg="pgp-sha256"; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78603 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --nextPart5017014.31r3eYUQgx Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Sughosha <sughosha@HIDDEN> To: 78603 <at> debbugs.gnu.org Date: Tue, 27 May 2025 19:22:09 +0530 Message-ID: <6163579.lOV4Wx5bFT@HIDDEN> MIME-Version: 1.0 On Tuesday, May 27, 2025 6:58:15=E2=80=AFPM GMT+5:30 Sughosha wrote: > This fixes readymedia configured by a different user. >=20 > * gnu/services/upnp.scm (readymedia-configuration)[cache-directory]: Upda= te > path. > [log-directory]: Ditto. >=20 > Change-Id: I629c937973ca46bcd6e60382aa7576b9859515be > --- > gnu/services/upnp.scm | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) >=20 > diff --git a/gnu/services/upnp.scm b/gnu/services/upnp.scm > index 8267b1e53af..a5954c83f40 100644 > --- a/gnu/services/upnp.scm > +++ b/gnu/services/upnp.scm > @@ -74,19 +74,12 @@ (define-record-type* <readymedia-configuration> > (default #f)) > (cache-directory readymedia-configuration-cache-directory > (default (if for-home? > - (string-append (or (getenv > "XDG_CACHE_HOME") - =20 > (string-append - (gete= nv > "HOME") "/.cache")) - =20 > "/readymedia") > - %readymedia-default-cache-directory))) > + ".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))) > + ".local/state/readymedia" > + %readymedia-default-log-directory))) > (friendly-name readymedia-configuration-friendly-name > (default #f)) > (media-directories readymedia-configuration-media-directories) >=20 > base-commit: c15f786f8936502249b639220997094fdbf7f1e8 Sorry, when I checked the log this is giving the following error: =2D-8<---------------cut here---------------start------------->8--- 2025-05-27 19:04:38 gnu/build/linux-container.scm:476:16: In procedure stat= fs:=20 =2Ecache/readymedia: No such file or directory 2025-05-27 19:04:38 Backtrace: 2025-05-27 19:04:38 3 (primitive-load "/gnu/store/ 0b4l0f7yypzqww1h3hchqkqvam9=E2=80=A6") 2025-05-27 19:04:38 In ice-9/eval.scm: 2025-05-27 19:04:38 191:35 2 (_ #f) 2025-05-27 19:04:38 In gnu/build/linux-container.scm: 2025-05-27 19:04:38 368:8 1 (call-with-temporary-directory #<procedure= =20 7f07dc3c82a0=E2=80=A6>) 2025-05-27 19:04:38 476:16 0 (_ "/tmp/guix-directory.puYgco") =2D-8<---------------cut here---------------end--------------->8--- =2D-=20 Sughosha --nextPart5017014.31r3eYUQgx Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE6tGJ5HmbXl6yCioZzbwL2VlDpwYFAmg1w4kACgkQzbwL2VlD pwbhMA//e5p5YhjGtAQHxBetSaxYWrSKp1Kun7afuDeAy+/3hFMPMG5+fXtXPgrt qQU/L4hl7Cb12dGSQybQpvZbVAj2z9RcZr5VX1tuEyIgA1060xS+y9RPMxNck+6K IppJE8vwuMf8z1tts4ziYD7YxnLMTsX++wqzbCGtW33o/ZTbHQcG265WZcVpvvU5 rbwuLwVHi+q0npJlu4Ng45WGcSqWAtkkxcweAcsOmTEfJ+ccZW0Sr+ifgVVnWBk9 ftwb+mWJTt1leWfonM2m30E2TPv9L/VgmuVq6TaAb9SMpULiudnUL62zKm6MtcXJ eZRq0gGVwwljzsbzyenPopJREOwRmZClEk7zo34gZbmSmSuTXKHagtkaDQC2Lxt5 1eTTO9XItFjZk9+RBJfC0BxZLgIaYpRqcI/8jMTNNc91cxOVOjWSAxkhvebrvCqE puREREuiz7d8qL7XUWjYkSkoO4RIeHZbvJ08g9z1G7flvV1ekvFYppQKtSGd3RW7 P2tpo6cTVS5RR86UJhMFCR/Q3JvncHPSWXeLl0OLi6k43MrIOAvt3cWJ/wuwfOiH vbk4m7XdK9u0wHfj14jESHf+PUwlg8xLWcfRyHTb2Ggo54cEGeGA40AYzcOO81Rn aKYiwMNVJcuqKUoxVZFREtAPDEnFfR5t7IakBBp4KvpSjrzKRCE= =VQ41 -----END PGP SIGNATURE----- --nextPart5017014.31r3eYUQgx--
guix-patches@HIDDEN:bug#78603; Package guix-patches.
Full text available.
Received: (at 78603) by debbugs.gnu.org; 27 May 2025 13:28:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 27 09:28:46 2025
Received: from localhost ([127.0.0.1]:40224 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uJuMH-0007R1-SW
for submit <at> debbugs.gnu.org; Tue, 27 May 2025 09:28:46 -0400
Received: from layka.disroot.org ([178.21.23.139]:58774)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <sughosha@HIDDEN>)
id 1uJuMF-0007QK-B8
for 78603 <at> debbugs.gnu.org; Tue, 27 May 2025 09:28:44 -0400
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 07D3525F07;
Tue, 27 May 2025 15:28:42 +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 EuutzZUv2VKD; Tue, 27 May 2025 15:28:41 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1748352521; bh=4fRisxidVIgzA6rCqPNyDMD9BfNpvzlzYUun0fkWkjU=;
h=From:To:Cc:Subject:Date;
b=lMh6pNwDj6nK485ukz+/56qp3aDyah8IMaorz1oxC0deXQBzqbwF0gtgFJrTkciaF
TB/7mKbKIpt/pf7WNoOb4YNtHu4Xwc8XL6nv3rwrEfIf4ajTfgInxtEUmFFYw+tXlB
dHYx2p4pMDrbMdlANSvW4McGYa6eNIQY1hr3nXB1vfU3D9GS79oSHnat2pQ0C5Pve0
JVptOcVXd4RxTevKZ169tcrbbuv0cQEUYq9Hw11pzm8sDVE1rndG0P1/tbIGHwEH3v
ouKVX59PYwxa0qilTIEEtaQF1OjvlOVonIbUBstWdkpqZj6KQDVKF/DqKEnLhCQkPk
HO1YLK7SuDymg==
From: Sughosha <sughosha@HIDDEN>
To: 78603 <at> debbugs.gnu.org
Subject: [PATCH v2] services: readymedia: Use relative paths to cache and log
directories for home.
Date: Tue, 27 May 2025 18:58:15 +0530
Message-ID: <847e37421c511c1d959d01047401e379d81a3388.1748352495.git.sughosha@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 78603
Cc: Sughosha <sughosha@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This fixes readymedia configured by a different user.
* gnu/services/upnp.scm (readymedia-configuration)[cache-directory]: Update
path.
[log-directory]: Ditto.
Change-Id: I629c937973ca46bcd6e60382aa7576b9859515be
---
gnu/services/upnp.scm | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/gnu/services/upnp.scm b/gnu/services/upnp.scm
index 8267b1e53af..a5954c83f40 100644
--- a/gnu/services/upnp.scm
+++ b/gnu/services/upnp.scm
@@ -74,19 +74,12 @@ (define-record-type* <readymedia-configuration>
(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)))
+ ".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)))
+ ".local/state/readymedia"
+ %readymedia-default-log-directory)))
(friendly-name readymedia-configuration-friendly-name
(default #f))
(media-directories readymedia-configuration-media-directories)
base-commit: c15f786f8936502249b639220997094fdbf7f1e8
--
2.49.0
guix-patches@HIDDEN:bug#78603; Package guix-patches.
Full text available.Received: (at 78603) by debbugs.gnu.org; 27 May 2025 13:28:02 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 27 09:28:02 2025 Received: from localhost ([127.0.0.1]:40221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uJuLZ-0007O8-Ok for submit <at> debbugs.gnu.org; Tue, 27 May 2025 09:28:02 -0400 Received: from layka.disroot.org ([178.21.23.139]:33830) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <sughosha@HIDDEN>) id 1uJuLU-0007Nm-57 for 78603 <at> debbugs.gnu.org; Tue, 27 May 2025 09:27:58 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id D47AB25BB3; Tue, 27 May 2025 15:27:53 +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 A65WMDMs-1Ql; Tue, 27 May 2025 15:27:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1748352472; bh=17ykDGA9BsbShOYfZ5K7qql0VkxHe4gZZI/VQitKwKI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Kls+mquTnEPuHv+mffqlKd1d2y43Si55mg2ykVuTd6I7RtcCcV92sp2XjTP68+Hum TiBvAVQI6TCSdj4byUM6OCEglli+DB58+MTqhZlL2emOLoJFLkOl8wKTX9c4EeETJo i7nziCAFHwmKrNx6DGhzqyjxQjKFSFi0O1fYgKdOWQe7BhTLG4kf5ncIxBcwGC4k7V v3+FmZ5Ib83oG7vHBfmzhUEd5lq2gphVmmfSmr/pi4Mzxc2P/CBuMUYdeUrXjWsMyE OFihyYUae3HSpXA7liv0F3gXy3tTWaU05rwgGBf6o66E+tGW1/H3ZaBFaj2USOkAnP rNCu3AEonAeSQ== From: Sughosha <sughosha@HIDDEN> To: Sergey Trofimov <sarg@HIDDEN> Subject: Re: [bug#78603] [PATCH] services: readymedia: Respect SUDO_HOME if configuring for home. Date: Tue, 27 May 2025 18:57:31 +0530 Message-ID: <5891857.DvuYhMxLoT@HIDDEN> In-Reply-To: <877c22s2ex.fsf@HIDDEN> References: <877c22s2ex.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart6161319.lOV4Wx5bFT"; micalg="pgp-sha256"; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78603 Cc: 78603 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --nextPart6161319.lOV4Wx5bFT Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Sughosha <sughosha@HIDDEN> To: Sergey Trofimov <sarg@HIDDEN> Cc: 78603 <at> debbugs.gnu.org Date: Tue, 27 May 2025 18:57:31 +0530 Message-ID: <5891857.DvuYhMxLoT@HIDDEN> In-Reply-To: <877c22s2ex.fsf@HIDDEN> References: <877c22s2ex.fsf@HIDDEN> MIME-Version: 1.0 On Tuesday, May 27, 2025 5:15:10=E2=80=AFPM GMT+5:30 Sergey Trofimov wrote: > Hi Sughosha, >=20 > Sughosha <sughosha@HIDDEN> writes: > > 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. > >=20 > > * gnu/services/upnp.scm (readymedia-configuration)[cache-directory]: > > Respect SUDO_HOME if configuring for home. > > [log-directory]: Ditto. > >=20 > > Change-Id: Ie6905c0b83608f91582671cde9d866079178f192 > > --- > >=20 > > gnu/services/upnp.scm | 25 ++++++++++++++----------- > > 1 file changed, 14 insertions(+), 11 deletions(-) > >=20 > > 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* <readymedia-configuration> > >=20 > > (default #f)) > > =20 > > (cache-directory readymedia-configuration-cache-directory > > =20 > > (default (if for-home? > >=20 > > - (string-append (or (getenv > > "XDG_CACHE_HOME") - =20 > > (string-append - =20 > > (getenv "HOME") "/.cache")) - = =20 > > "/readymedia") > > - %readymedia-default-cache-directory))) > > + (if (getenv "XDG_CACHE_HOME") > > + (string-append (getenv > > "XDG_CACHE_HOME") + =20 > > "/readymedia") + (string-append (or > > (getenv "SUDO_HOME") + = =20 > > (getenv "HOME")) + = =20 > > "/.cache/readymedia")) + =20 > > %readymedia-default-cache-directory))) > That's a brittle solution: this code runs when the file is loaded, > setting the defaults to the values of host environment. This is not what > you generally want, because the target environment might be different, > i.e. I might be building home profile for another user and the resulting > config should contain their username. >=20 > Check how `syncthing-configuration` works. I think that the simplest > solution would be to use relative paths for installations to user homes. > The shepherd service is run from the $HOME, so just > `db_dir=3D.cache/readymedia` should work. If the user wants to use XDG > dirs, they should pass the correct values explicitly. Using relative paths without any variable is working. I will send v2 patch. =2D-=20 Sughosha --nextPart6161319.lOV4Wx5bFT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE6tGJ5HmbXl6yCioZzbwL2VlDpwYFAmg1vcMACgkQzbwL2VlD pwazHA/+IOMyLCeLi8oxC9nPdLWC2Ahi9wS3/YjkR3QkpwmPdKJAF3c5dKGCUpgd XlP5wfgOTfhMI/O7onIZ1bYbsFAbGS2FUGXPO8jpS7iz0JVLmAcfowHc5mQ6+mS3 MvLeted0igEvZ8Q5NA9RXwlS/Pk6UzpfekP2iNPI8uwo/MuRrCOidbYMJKtLeM88 4WC5sbrbHXyfE2412W4LvaKq+LcGQixPd2I1SWYw6MLb8IgPiHuc0ZJCMUsA8Q1T eyuMxDftQ7kl7CESmciOt+hpsUiLa8OMgVUcV2oqW2R7+JvYG2Hnw9JRWSmgNxOT WvY2h/tMN9PDM/YaNZdFhpi7bnW9v1S6umAx3ETG8wqBPqHk9tn93CyCQN5X046O 0NQk2lydv9MbV5Mc5pg1cJRnZ2KttAOGYV+yKplW5gj6k8kG8Nqin3s6mCwuOvtE C/QyqXV/jFk82xwlIpyqlV4UPlxs9NhmQOArjzqHtbHggLF0azvYYgakEDEmkeF6 T29VhO9CX5jVjDOrX4ZhrE7aFZ5k0pNp+42xXPiVt96Ujy0Y3AOhfGZjZS4h5+Wa bgWKgFsj4kH70NrchfFtCUi5zij/VmM+LQ3XbyZdmmhYBiYjK3b/uaMjvmxUXJIk gnjTXc0JiI3ZssmevU40jCiA8Tn914VdEpialnvx+yJPC3rQYzM= =aIv+ -----END PGP SIGNATURE----- --nextPart6161319.lOV4Wx5bFT--
guix-patches@HIDDEN:bug#78603; Package guix-patches.
Full text available.Received: (at 78603) by debbugs.gnu.org; 27 May 2025 11:45:27 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 27 07:45:27 2025 Received: from localhost ([127.0.0.1]:39506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uJskI-0008UO-Mw for submit <at> debbugs.gnu.org; Tue, 27 May 2025 07:45:27 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:53430) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <sarg@HIDDEN>) id 1uJskA-0008TI-O8 for 78603 <at> debbugs.gnu.org; Tue, 27 May 2025 07:45:23 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3a36748920cso3313544f8f.2 for <78603 <at> debbugs.gnu.org>; Tue, 27 May 2025 04:45:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1748346311; x=1748951111; darn=debbugs.gnu.org; h=mime-version:message-id:date:user-agent:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=yapZ0MmBIaCdLHBCYYKHYAmd7c55BPquOkHVtPechDE=; b=DGjZNiHnYhjPFyomOuQC9uc9xq6Hl54dN4Z+BLQqA3t6cBkfBmcQZn6Mmrp6ksxgdM 1tAaoSDmo8NzTGmucjFt6Kmq/qPcUd9eFnL3Q01nuqjM/e9+deSSk7tXXMp6X7U/atQB x4DdvOD5oxO5QF2jfvH8SgJhvk4J/7+yXFdL2BzuKqguTro3u178epAOVlY9dR8Dp7x5 Ketw3MxZLBOvz0SDoEZS577a+w6mB/TgGmMbSFfArqtFhNReys3vJWqyJGuFIVz09xME Tgzp/RI+MVpZ/3pr+CZWU9SsHBr5egLuikSqDgACAuiCgnpUBhWw/O1dk1ixVLfZZ+FH gF2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748346311; x=1748951111; h=mime-version:message-id:date:user-agent:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yapZ0MmBIaCdLHBCYYKHYAmd7c55BPquOkHVtPechDE=; b=Q3wrm+KWAjwoBN16hFz9uBg78w978llp9C1vYatJEO6OQgFW0ItLTAKosqyMcidtph eTI/FOV7XMhpVWIWSZO9tWTMcprn/Ck+wrN5xt9Kz9mL6gxGfHDLkuzXC5z9spyBgleC PfnvxfCvM9CsfeVTpk6VsdK6FAJs5ytwqcTBJ9P4VLbJOzlwH8KCnhZAs+hXzgm7Qgk2 GJr7Wv8yUo1WvP8xCIwHm8PWu99X3gERNWJEQSwJyJJjIbnNYj7Mvc2lqmHd7qWagzgp Fd0vWfX5EjfS7JRMPPDa7LgaEAbvEUCeg84APiIYU5YDL/FIIf5LzstrbUxLZO0TB6fL v7pg== X-Gm-Message-State: AOJu0YztXvGynqPcw4gohmEyWJ6tDqXOhCueCzvvN1ibMgcv3hV11K5E d6bem2BjIE7vXNDuitPEk/SDcf9shmnqm8t9KD97S/RS6lisFRvro3JmLP5fkwZln9M= X-Gm-Gg: ASbGncv+NyuSY1XrcvP/noPqNvGYXusha99RR9iV/+P5YSH6TJc/yJM4HUc9BxzNzCf LvR62kb7hpi8vI1DD0ZKeojdEPaGw8+tjm9CJDzaIr9xKZJm9E62hxR8QOq6U2Gkf+ipHyw5Jig dKxjVGtZNLQ3RVgEj6WI9xsWWnZep+yzTc1NbjxaqhkBNgZJXIbZJN06oRYf7RbzJbFkjp+MC0n DS6BXjvUPyPEgah2cw0P95vduOHQ7wvy4ygeQ7ANqDSb1RoHQl5ii1Qz6rXkYYDpXQBhWe7JZWO 1XwdsjPU9PrdthPdPE/K1vHrVz+obkAZXUoKzQF5w4F2Y3GP X-Google-Smtp-Source: AGHT+IHffwGnLsgoScOFDKKLsYMUlxl64pcCYTr5GJq1nH+2usN5QMr0IdlpQZhDmqpvmpCBCSX0fg== X-Received: by 2002:a05:6000:290e:b0:399:6dd9:9f40 with SMTP id ffacd0b85a97d-3a4cb43db83mr9345034f8f.9.1748346311454; Tue, 27 May 2025 04:45:11 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a35ca8d005sm38778400f8f.90.2025.05.27.04.45.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 May 2025 04:45:11 -0700 (PDT) From: Sergey Trofimov <sarg@HIDDEN> To: Sughosha <sughosha@HIDDEN> Subject: Re: [bug#78603] [PATCH] services: readymedia: Respect SUDO_HOME if configuring for home. User-Agent: mu4e 1.12.11; emacs 30.0.92 Date: Tue, 27 May 2025 13:45:10 +0200 Message-ID: <877c22s2ex.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78603 Cc: 78603 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Sughosha, Sughosha <sughosha@HIDDEN> writes: > 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(-) > > 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* <readymedia-configuration> > (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))) That's a brittle solution: this code runs when the file is loaded, setting the defaults to the values of host environment. This is not what you generally want, because the target environment might be different, i.e. I might be building home profile for another user and the resulting config should contain their username. Check how `syncthing-configuration` works. I think that the simplest solution would be to use relative paths for installations to user homes. The shepherd service is run from the $HOME, so just `db_dir=.cache/readymedia` should work. If the user wants to use XDG dirs, they should pass the correct values explicitly.
guix-patches@HIDDEN:bug#78603; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 27 May 2025 09:27:58 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 27 05:27:58 2025
Received: from localhost ([127.0.0.1]:38446 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uJqbG-0003Uh-7e
for submit <at> 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 <sughosha@HIDDEN>)
id 1uJqbC-0003U3-U2
for submit <at> 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 <sughosha@HIDDEN>)
id 1uJqb6-0005iw-4F
for guix-patches@HIDDEN; 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 <sughosha@HIDDEN>)
id 1uJqay-0000Ec-KG
for guix-patches@HIDDEN; 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==
From: Sughosha <sughosha@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] services: readymedia: Respect SUDO_HOME if configuring for
home.
Date: Tue, 27 May 2025 14:56:16 +0530
Message-ID: <abfbb47782cfe6c6800b86731658c4ed9c4e524a.1748337976.git.sughosha@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=178.21.23.139; envelope-from=sughosha@HIDDEN;
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-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
Cc: Sughosha <sughosha@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)
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(-)
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* <readymedia-configuration>
(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)
base-commit: c15f786f8936502249b639220997094fdbf7f1e8
--
2.49.0
Sughosha <sughosha@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#78603; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.