From: "Ludovic Courtès" <ludo@gnu.org>
To: John Kehayias <john.kehayias@protonmail.com>
Cc: jman <jman@city17.xyz>, 60566@debbugs.gnu.org
Subject: bug#60566: [PATCH] environment: Fix '--emulate-fhs' option overriding $PATH.
Date: Sat, 07 Jan 2023 00:03:40 +0100 [thread overview]
Message-ID: <874jt3xo37.fsf@gnu.org> (raw)
In-Reply-To: <874jt4k7bl.fsf@protonmail.com> (John Kehayias's message of "Thu, 05 Jan 2023 21:19:48 +0000")
Hi,
John Kehayias <john.kehayias@protonmail.com> skribis:
> From 57cdc3a8f9c6451aaf17f1fafae0bcf29faeea03 Mon Sep 17 00:00:00 2001
> From: John Kehayias <john.kehayias@protonmail.com>
> Date: Thu, 5 Jan 2023 16:06:19 -0500
> Subject: [PATCH] * environment: Fix '--emulate-fhs' option overriding $PATH.
>
> Fixes <https://issues.guix.gnu.org/60566> where even if "--preserve='^PATH$'"
> was passed to 'guix shell' it would be replaced by just the FHS directories
> when '--emulate-fhs' was also set.
>
> * gnu/scripts/environment.scm (launch-environment): Add the FHS directories to
> $PATH rather than overriding $PATH completely.
> ---
> guix/scripts/environment.scm | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
> index c7fd8fd340..20fa5850c4 100644
> --- a/guix/scripts/environment.scm
> +++ b/guix/scripts/environment.scm
> @@ -475,10 +475,11 @@ (define* (launch-environment command profile manifest
> (catch 'system-error
> (lambda ()
> (when emulate-fhs?
> - ;; When running in a container with EMULATE-FHS?, override $PATH
> + ;; When running in a container with EMULATE-FHS?, augment $PATH
> ;; (optional, but to better match FHS expectations), and generate
> ;; /etc/ld.so.cache.
> - (setenv "PATH" "/bin:/usr/bin:/sbin:/usr/sbin")
> + (setenv "PATH" (string-append "/bin:/usr/bin:/sbin:/usr/sbin:"
> + (getenv "PATH")))
To be safe, you need to account for (getenv "PATH") returning #f, and
not add a trailing colon in that case.
Other than that, I agree this is a valid change because that would be
consistent with:
--8<---------------cut here---------------start------------->8---
$ PATH=/foo $(type -P guix) shell -E ^PATH$ -C coreutils -- env |grep ^PATH
PATH=/gnu/store/pfl0lyqbs557khv7rw90bzp24qp2lqsn-profile/bin:/foo
--8<---------------cut here---------------end--------------->8---
Perhaps you can add a line to test it in
‘tests/guix-environment-container.sh’?
Thanks,
Ludo’.
next prev parent reply other threads:[~2023-01-06 23:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-04 22:33 bug#60566: guix container with FHS emulation and env vars jman via Bug reports for GNU Guix
2023-01-05 21:19 ` bug#60566: [PATCH] environment: Fix '--emulate-fhs' option overriding $PATH John Kehayias via Bug reports for GNU Guix
2023-01-06 23:03 ` Ludovic Courtès [this message]
2023-01-13 21:44 ` John Kehayias via Bug reports for GNU Guix
2023-01-14 14:41 ` Ludovic Courtès
2023-01-15 23:05 ` John Kehayias via Bug reports for GNU Guix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874jt3xo37.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=60566@debbugs.gnu.org \
--cc=jman@city17.xyz \
--cc=john.kehayias@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.