From 3a36180a373d91adcf9726660204f0cc1dcecba3 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Wed, 21 May 2025 17:46:40 -0400 Subject: [PATCH] dashboard: fix the workaround for unpacking node sources My previous workaround in the dashboard for the unpacking of non-root own tarball as the fake root of a container did not work because of the strange quoting/escaping behavior of cmake (it tried to run `id -u` as a single command, not a command and an argument). Use single quoted string and old school backticks to work around this issue. Fixes: 24dbfb5da4813c6588f9cd199b9f527bb67f1e88 Signed-off-by: John Mulligan --- src/pybind/mgr/dashboard/frontend/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt index 901f10487755e..ab4aa689385f2 100644 --- a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt +++ b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt @@ -69,7 +69,7 @@ else(WITH_SYSTEM_NPM) # the current user. This can be an issue due to the node tarball using # uid 1000 and running the unpack in a id-mapped namespace (container) # that lets tar set the uid to a "bad" uid outside the namespace - COMMAND bash -c "chown -R $$(id -u):$$(id -g) ${mgr-dashboard-nodeenv-dir}/src" + COMMAND bash -c 'chown -R `id -u`:`id -g` ${mgr-dashboard-nodeenv-dir}/src' COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "dashboard nodeenv is being installed") -- 2.39.5