From 4dc75c67f9221249990bc0043463fe9b893b0b52 Mon Sep 17 00:00:00 2001 From: tomsweeneyredhat Date: Tue, 4 Jun 2024 14:06:22 -0400 Subject: [PATCH] [v5.1] pkg/rootless: set _CONTAINERS_USERNS_CONFIGURED ... correctly I tried to cherry pick 7c5c60b from @luap99, however the git cherry-pick wasn't having it. I've made the changes "by hand" to set _CONTAINERS_USERNS_CONFIGURED from init to done in pkg/rootless/rootless_linux.c Signed-off-by: tomsweeneyredhat --- pkg/rootless/rootless_linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index 2ddfdb02d327..6e4702946ba0 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -880,7 +880,7 @@ reexec_userns_join (int pid_to_join, char *pause_pid_file_path) setenv ("LISTEN_FDNAMES", saved_systemd_listen_fdnames, true); } - setenv ("_CONTAINERS_USERNS_CONFIGURED", "init", 1); + setenv ("_CONTAINERS_USERNS_CONFIGURED", "done", 1); setenv ("_CONTAINERS_ROOTLESS_UID", uid, 1); setenv ("_CONTAINERS_ROOTLESS_GID", gid, 1); @@ -1081,7 +1081,7 @@ reexec_in_user_namespace (int ready, char *pause_pid_file_path, char *file_to_re setenv ("LISTEN_FDNAMES", saved_systemd_listen_fdnames, true); } - setenv ("_CONTAINERS_USERNS_CONFIGURED", "init", 1); + setenv ("_CONTAINERS_USERNS_CONFIGURED", "done", 1); setenv ("_CONTAINERS_ROOTLESS_UID", uid, 1); setenv ("_CONTAINERS_ROOTLESS_GID", gid, 1);