From 114b2443b50ac356e0a7bcaba75fe9cb506cf24f Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Thu, 15 Aug 2019 18:41:05 +0200 Subject: [PATCH] ci: Fix /etc/sub{u,g}id parsing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The $ needs to be escaped when calling shell code from a Makefile. Signed-off-by: Andrea Bolognani Reviewed-by: Ján Tomko --- Makefile.ci | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.ci b/Makefile.ci index 865cba7660..ac859dcb95 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -118,8 +118,8 @@ ifeq ($(CI_ENGINE),podman) # your /etc/sub{u,g}id allow users to have more IDs. Unless # --keep-uid is supported, let's do this in a way that should # work for everyone. - CI_MAX_UID = $(shell sed -n "s/^$USER:[^:]\+://p" /etc/subuid) - CI_MAX_GID = $(shell sed -n "s/^$USER:[^:]\+://p" /etc/subgid) + CI_MAX_UID = $(shell sed -n "s/^$$USER:[^:]\+://p" /etc/subuid) + CI_MAX_GID = $(shell sed -n "s/^$$USER:[^:]\+://p" /etc/subgid) ifeq ($(CI_MAX_UID),) CI_MAX_UID = 65536 endif