From: Luca Boccassi <bluca@debian.org>
Date: Sun, 19 Jul 2020 12:11:52 +0000 (+0100)
Subject: nspawn: set container_host env vars before user arguments
X-Git-Tag: v246-rc2~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed4512d009e94c0ae2375a50e2d008d1a851ebd2;p=thirdparty%2Fsystemd.git

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
---

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();