[systemd-devel] [PATCH] DEFAULT_PATH_SPLIT_USR macro

[Zbigniew Jędrzejewski-Szmek]

On Fri, Dec 20, 2013 at 03:35:38PM -0800, Shawn Landden wrote:
> ---
>  src/nspawn/nspawn.c    | 2 +-
>  src/shared/path-util.h | 4 +++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
> index a85579b..241b4b5 100644
> --- a/src/nspawn/nspawn.c
> +++ b/src/nspawn/nspawn.c
> @@ -1243,7 +1243,7 @@ int main(int argc, char *argv[]) {
>                          gid_t gid = (gid_t) -1;
>                          unsigned n_env = 2;
>                          const char *envp[] = {
> -                                "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
> +                                "PATH=" DEFAULT_PATH_SPLIT_USR,
>                                  "container=systemd-nspawn", /* LXC sets container=lxc, so follow the scheme here */
>                                  NULL, /* TERM */
>                                  NULL, /* HOME */
Applied with a small change.

Zbyszek