From ed4512d009e94c0ae2375a50e2d008d1a851ebd2 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 19 Jul 2020 13:11:52 +0100 Subject: [PATCH] nspawn: set container_host env vars before user arguments Allows users on the command line to seamlessly override $container_host_* just like they can override $container_id and $container --- src/nspawn/nspawn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 330bd7e7d29..3020ef975ce 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -3191,7 +3191,7 @@ static int inner_child( if (asprintf((char **)(envp + n_env++), "NOTIFY_SOCKET=%s", NSPAWN_NOTIFY_SOCKET_PATH) < 0) return log_oom(); - env_use = strv_env_merge(3, envp, arg_setenv, os_release_pairs); + env_use = strv_env_merge(3, envp, os_release_pairs, arg_setenv); if (!env_use) return log_oom(); -- 2.39.2